mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-10-29 05:40:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: journal: Prevent duplicate values for CODE_* fields

Browse source 
sd_journal_send() implicitly add fields for the source file,
function name and code line from where it's invoked. As code
location fields CODE_FILE, CODE_LINE and CODE_FUNC are handled
by PA's log module, we do not want the automatic values
supplied by the sd_journal API.

Without suppressing these, both the actual log event source
and the call to sd_journal_send() will be logged:

    $ journalctl -b -f -o json-pretty
    [...]
    CODE_FILE : [ pulsecore/log.c, pulsecore/module.c ],
    CODE_LINE : [ 505, 181 ],
    MESSAGE   : Failed to load module module-gconf
    CODE_FUNC : [ pa_log_levelv_meta, pa_module_load ],
    [...]

(Commit log adapted from abrt libreport commit d1eaae97f0287f)

Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
This commit is contained in:
Ahmed S. Darwish 2016-03-13 23:56:54 +02:00 • committed by Tanu Kaskinen
parent d9c91f852e
commit 0f48b7c823
1 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/pulsecore/log.c
View file

@ -39,6 +39,17 @@
#endif
#ifdef HAVE_SYSTEMD_JOURNAL
/* sd_journal_send() implicitly add fields for the source file,
* function name and code line from where it's invoked. As the
* correct code location fields CODE_FILE, CODE_LINE and
* CODE_FUNC are already handled by this module, we do not want
* the automatic values supplied by the systemd journal API.
*
* Without suppressing these, both the actual log event source
* and the call to sd_journal_send() will be logged. */
#define SD_JOURNAL_SUPPRESS_LOCATION
#include <systemd/sd-journal.h>
#endif