mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-06 13:29:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

log: Fix compilation error on non-systemd systems

Browse source 
Commit 262bdae0330e used symbols which are only available if systemd
support was compiled in. Fix by using the appropriate #ifdef guards.

Also document the resulting PULSE_LOG_JOURNAL environment variable
behavior if systemd journal support was not compiled in.

[Diwic: changed wording slightly.]

Reported-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Ahmed S. Darwish <darwish.07@gmail.com>
This commit is contained in:
Ahmed S. Darwish 2015-09-16 23:38:38 +02:00 • committed by Tanu Kaskinen
parent ac5b7b8d5c
commit 5d4905ec31
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/pulse/pulseaudio.h
View file

@ -147,7 +147,8 @@
* and function are included by default through the journal fields * and function are included by default through the journal fields
* `CODE_FILE`, `CODE_FUNC`, and `CODE_LINE`. Any backtrace attached to * `CODE_FILE`, `CODE_FUNC`, and `CODE_LINE`. Any backtrace attached to
* the logging message is sent through the PulseAudio-specific journal * the logging message is sent through the PulseAudio-specific journal
* field `PULSE_BACKTRACE`. * field `PULSE_BACKTRACE`. This environment variable has no effect if
* PulseAudio was compiled without systemd journal support.
* - `PULSE_LOG_COLORS`: If defined, enables colored logging output. * - `PULSE_LOG_COLORS`: If defined, enables colored logging output.
* - `PULSE_LOG_TIME`: If defined, include timestamps with each message. * - `PULSE_LOG_TIME`: If defined, include timestamps with each message.
* - `PULSE_LOG_FILE`: If defined, include each message originating file * - `PULSE_LOG_FILE`: If defined, include each message originating file

2
src/pulsecore/log.c
View file

@ -294,10 +294,12 @@ static void init_defaults(void) {
target_override_set = true; target_override_set = true;
} }
#ifdef HAVE_SYSTEMD_JOURNAL
if (getenv(ENV_LOG_JOURNAL)) { if (getenv(ENV_LOG_JOURNAL)) {
target_override = PA_LOG_JOURNAL; target_override = PA_LOG_JOURNAL;
target_override_set = true; target_override_set = true;
} }
#endif
if ((e = getenv(ENV_LOG_LEVEL))) { if ((e = getenv(ENV_LOG_LEVEL))) {
maximum_level_override = (pa_log_level_t) atoi(e); maximum_level_override = (pa_log_level_t) atoi(e);