Attachment 920973 Details for Bug 1113215 – Fix syslog facility for kernel logs

[patch] Fix syslog facility for kernel logs

0001-journald-fix-facility-for-messages-coming-from-kmsg.patch (text/plain), 1.47 KB, created by Michal Sekletar on 2014-07-25 12:34:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michal Sekletar

Created: 2014-07-25 12:34:49 UTC

Size: 1.47 KB

patch

obsolete

>From 1130c4357cc7dcf366978ac52760da5d661d3855 Mon Sep 17 00:00:00 2001
>From: Michal Sekletar <msekleta@redhat.com>
>Date: Thu, 24 Jul 2014 16:18:13 +0200
>Subject: [PATCH] journald: fix facility for messages coming from kmsg
>
>---
> src/journal/journald-kmsg.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/journal/journald-kmsg.c b/src/journal/journald-kmsg.c
>index 9895808..c6c5bf4 100644
>--- a/src/journal/journald-kmsg.c
>+++ b/src/journal/journald-kmsg.c
>@@ -274,6 +274,9 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
>         if (asprintf(&syslog_priority, "PRIORITY=%i", priority & LOG_PRIMASK) >= 0)
>                 IOVEC_SET_STRING(iovec[n++], syslog_priority);
> 
>+        if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", priority & LOG_FACMASK) >= 0)
>+                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
>+
>         if ((priority & LOG_FACMASK) == LOG_KERN)
>                 IOVEC_SET_STRING(iovec[n++], "SYSLOG_IDENTIFIER=kernel");
>         else {
>@@ -295,9 +298,6 @@ static void dev_kmsg_record(Server *s, char *p, size_t l) {
>                         if (syslog_pid)
>                                 IOVEC_SET_STRING(iovec[n++], syslog_pid);
>                 }
>-
>-                if (asprintf(&syslog_facility, "SYSLOG_FACILITY=%i", LOG_FAC(priority)) >= 0)
>-                        IOVEC_SET_STRING(iovec[n++], syslog_facility);
>         }
> 
>         message = cunescape_length_with_prefix(p, pl, "MESSAGE=");
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1113215: 920973