Skip to content
Snippets Groups Projects
Commit 4cf7458c authored by zuul's avatar zuul Committed by Gerrit Code Review
Browse files

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

parents ffe345cf 87c9ab97
No related branches found
No related tags found
No related merge requests found
......@@ -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);
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment