diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-03-25 13:38:37 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-25 13:38:37 -0500 |
| commit | 096e7a88ce9d0df861cffe228d0fb6b64c39e445 (patch) | |
| tree | 7351cf395d6d7e24f828d7e722b7ee4bc7be4f1d /main | |
| parent | 36d016b1abb6707bfde821ac2407933a447f3d13 (diff) | |
| parent | 82e55e48835b3f71aa88c439ab406266b494d4f8 (diff) | |
Merge "core/logging: Fix broken syslog levels on older glibc." into 13
Diffstat (limited to 'main')
| -rw-r--r-- | main/logger.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/main/logger.c b/main/logger.c index 46d9cbb57..9db33c954 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1322,7 +1322,8 @@ static void ast_log_vsyslog(struct logmsg *msg, int facility) 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", levels[msg->level], msg->lwp, call_identifier_str, msg->file, msg->line, msg->function, msg->message); |