daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
84b277
From 7f85c4184fc45c3dd2c76b4867ab252c3530f84d Mon Sep 17 00:00:00 2001
84b277
From: Michal Sekletar <msekleta@redhat.com>
84b277
Date: Fri, 25 Jul 2014 14:38:22 +0200
84b277
Subject: [PATCH] journald: always add syslog facility for messages coming from
84b277
 kmsg
84b277
84b277
Set SYSLOG_FACILITY field for kernel log messages too. Setting only
84b277
SYSLOG_IDENTIFIER="kernel" is not sufficient and tools reading journal
84b277
maybe confused by missing SYSLOG_FACILITY field for kernel log messages.
84b277
84b277
(cherry picked from commit 36dd072cdf03dcac0fcd2d6b42f261444dc7ac88)
84b277
84b277
Resolves: #1113215
84b277
---
84b277
 src/journal/journald-kmsg.c | 6 +++---
84b277
 1 file changed, 3 insertions(+), 3 deletions(-)
84b277
84b277
diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
84b277
index 9895808..e393cb7 100644
84b277
--- a/src/journal/journald-kmsg.c
84b277
+++ b/src/journal/journald-kmsg.c
84b277
@@ -274,6 +274,9 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
84b277
         if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
84b277
                 IOVEC_SET_STRING(iovec[n++], syslog_priority);
84b277
 
84b277
+        if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
84b277
+                IOVEC_SET_STRING(iovec[n++], syslog_facility);
84b277
+
84b277
         if ((priority & LOG_FACMASK) == LOG_KERN)
84b277
                 IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
84b277
         else {
84b277
@@ -295,9 +298,6 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
84b277
                         if (syslog_pid)
84b277
                                 IOVEC_SET_STRING(iovec[n++], syslog_pid);
84b277
                 }
84b277
-
84b277
-                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
84b277
-                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
84b277
         }
84b277
 
84b277
         message = cunescape_length_with_prefix(p, pl, "MESSAGE=");