kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-04 20:25:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "core/logging: Fix broken syslog levels on older glibc." into 13

Browse Source
This commit is contained in:
zuul
2016-03-25 13:38:37 -05:00
committed by Gerrit Code Review
parent 36d016b1ab 82e55e4883
commit 096e7a88ce
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
main/logger.c
View File

@@ -1322,7 +1322,8 @@ static void ast_log_vsyslog(struct logmsg *msg, int facility)
return; return;
} }
syslog_level = LOG_MAKEPRI(facility, syslog_level); /* Don't use LOG_MAKEPRI because it's broken in glibc<2.17 */
syslog_level = facility | syslog_level; /* LOG_MAKEPRI(facility, syslog_level); */
snprintf(buf, sizeof(buf), "%s[%d]%s: %s:%d in %s: %s", snprintf(buf, sizeof(buf), "%s[%d]%s: %s:%d in %s: %s",
levels[msg->level], msg->lwp, call_identifier_str, msg->file, msg->line, msg->function, msg->message); levels[msg->level], msg->lwp, call_identifier_str, msg->file, msg->line, msg->function, msg->message);