From 40487e485db9ad6c25f2cb42747098ef11b0a6c4 Mon Sep 17 00:00:00 2001 From: Peter Hutterer Date: Sat, 25 Sep 2021 07:21:01 +1000 Subject: [PATCH] daemon: only call pw_log_set_level() if -v is actually given Previous commit 69e935e unconditionally called pw_log_set_level() after the option parsing. If pw_init() changed the logging level based on PIPEWIRE_DEBUG, we'd now overwrite that change. Call pw_log_set_level() only if -v is actually given on the commandline. This means a commandline option will override PIPEWIRE_DEBUG if set but that is intended. Fixes 69e935e8a452de252fc2c443dcac8e4371c165ea --- src/daemon/pipewire.c | 3 +-- src/media-session/media-session.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/daemon/pipewire.c b/src/daemon/pipewire.c index 622b5718c..743b92478 100644 --- a/src/daemon/pipewire.c +++ b/src/daemon/pipewire.c @@ -80,7 +80,7 @@ int main(int argc, char *argv[]) switch (c) { case 'v': if (level < SPA_LOG_LEVEL_TRACE) - level++; + pw_log_set_level(++level); break; case 'h': show_help(argv[0], config_name); @@ -101,7 +101,6 @@ int main(int argc, char *argv[]) goto done; } } - pw_log_set_level(level); properties = pw_properties_new( PW_KEY_CONFIG_NAME, config_name, diff --git a/src/media-session/media-session.c b/src/media-session/media-session.c index 8334910d3..35f53303e 100644 --- a/src/media-session/media-session.c +++ b/src/media-session/media-session.c @@ -2455,7 +2455,7 @@ int main(int argc, char *argv[]) switch (c) { case 'v': if (level < SPA_LOG_LEVEL_TRACE) - level++; + pw_log_set_level(++level); break; case 'h': do_show_help = true; @@ -2475,7 +2475,6 @@ int main(int argc, char *argv[]) return -1; } } - pw_log_set_level(level); impl.this.props = pw_properties_new( PW_KEY_CONFIG_PREFIX, SESSION_PREFIX,