From 4cee3a78bb9190a823ca08808c451daa802622e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Wed, 9 Dec 2015 21:29:38 -0500 Subject: [PATCH] manager: log log level changes uniformly Output the same message when a request to change the log level is received over dbus and through a signal. From the user point of view those two operations are very similar and it's easy to think that the dbus operation didn't work when the expected message is not emitted. Also "downgrade" the message level to info, since this is a normal user initiated action. --- src/core/dbus-manager.c | 5 ++++- src/core/manager.c | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c index 5457b2451b..293750bbe7 100644 --- a/src/core/dbus-manager.c +++ b/src/core/dbus-manager.c @@ -229,7 +229,10 @@ static int property_set_log_level( if (r < 0) return r; - return log_set_max_level_from_string(t); + r = log_set_max_level_from_string(t); + if (r == 0) + log_info("Setting log level to %s.", t); + return r; } static int property_get_n_names( diff --git a/src/core/manager.c b/src/core/manager.c index 9f65e0ff32..e65616adc1 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1894,12 +1894,12 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t case 22: log_set_max_level(LOG_DEBUG); - log_notice("Setting log level to debug."); + log_info("Setting log level to debug."); break; case 23: log_set_max_level(LOG_INFO); - log_notice("Setting log level to info."); + log_info("Setting log level to info."); break; case 24: