External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-11-05 04:41:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

util: fix syslog facility value

Browse Source 
We set SYSLOG_PRIORITY when sending to journald to avoid our
messages getting tagged with the default facility which is
used for the kernel.

Unfortunately:

  commit fd00f0e6c7
  Author: Guido Günther <agx@sigxcpu.org>
  Date:   Mon Sep 21 20:06:55 2015 +0200

    Use daemon log facility for journald

used the LOG_nnn constants from the syslog header without realizing
that these values have a bit-shift applied. While Linux defines a
LOG_FAC() macros to undo the bit-shift this doesn't appear to be
standardized. So the safe thing is to just use the raw value since
these values are fixed by RFC 5424.

Reviewed-by: Ján Tomko <jtomko@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
This commit is contained in:
Daniel P. Berrangé 2022-01-18 16:45:35 +00:00
parent 6c68f120a5
commit 017fa1e097
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/util/virlog.c
View File

@ -925,7 +925,13 @@ virLogOutputToJournald(virLogSource *source,
journalAddString(&state, "MESSAGE", rawstr); journalAddString(&state, "MESSAGE", rawstr);
journalAddInt(&state, "PRIORITY", journalAddInt(&state, "PRIORITY",
virLogPrioritySyslog(priority)); virLogPrioritySyslog(priority));
journalAddInt(&state, "SYSLOG_FACILITY", LOG_DAEMON); /* See RFC 5424 section 6.2.1
*
* Don't use LOG_nnn constants as those have a bit-shift
* applied for use with syslog() API, while journald
* needs the raw value
*/
journalAddInt(&state, "SYSLOG_FACILITY", 3);
journalAddString(&state, "LIBVIRT_SOURCE", source->name); journalAddString(&state, "LIBVIRT_SOURCE", source->name);
if (filename) if (filename)
journalAddString(&state, "CODE_FILE", filename); journalAddString(&state, "CODE_FILE", filename);