diff options
| author | zuul <zuul@gerrit.asterisk.org> | 2016-03-25 13:38:39 -0500 |
|---|---|---|
| committer | Gerrit Code Review <gerrit2@gerrit.digium.api> | 2016-03-25 13:38:39 -0500 |
| commit | 4cf7458c2e5b475f1545950c35d5fb863cdadd6b (patch) | |
| tree | ccf61c5e69ebe1bb92a2e4b388f336663bc2f33e /main | |
| parent | ffe345cf6e556c0c3f5e849a6df69a80d2f9b983 (diff) | |
| parent | 87c9ab97ea8038b3ef694d027bce26f29ea24777 (diff) | |
Merge "core/logging: Fix broken syslog levels on older glibc."
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 13f6de890..42a1c7000 100644 --- a/main/logger.c +++ b/main/logger.c @@ -1514,7 +1514,8 @@ static void logger_print_normal(struct logmsg *logmsg) continue; } - syslog_level = LOG_MAKEPRI(chan->facility, syslog_level); + /* Don't use LOG_MAKEPRI because it's broken in glibc<2.17 */ + syslog_level = chan->facility | syslog_level; /* LOG_MAKEPRI(chan->facility, syslog_level); */ if (!chan->formatter.format_log(chan, logmsg, buf, BUFSIZ)) { syslog(syslog_level, "%s", buf); } |