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

This commit is contained in:
zuul
2016-03-25 13:38:39 -05:00
committed by Gerrit Code Review

View File

@@ -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);
}