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

9 years ago · 096e7a88ce
parent 36d016b1ab 82e55e4883
commit 096e7a88ce
1 changed files with 2 additions and 1 deletions
--- 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);