From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 9 Dec 2020 10:12:33 +0000 (+0100)
Subject: log: add helper set sets log level in all realms
X-Git-Tag: v248-rc1~549
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c36b8bf530e80d848b2e67acd99588ecfb1e440;p=thirdparty%2Fsystemd.git

log: add helper set sets log level in all realms

Prompted-by: #17903
---

diff --git a/src/basic/log.h b/src/basic/log.h
index a2aae16df29..6c5e42a0e43 100644
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -44,10 +44,17 @@ typedef enum LogTarget{
 #define ERRNO_VALUE(val)                    (abs(val) & 255)
 
 void log_set_target(LogTarget target);
+
 void log_set_max_level_realm(LogRealm realm, int level);
+
 #define log_set_max_level(level)                \
         log_set_max_level_realm(LOG_REALM, (level))
 
+static inline void log_set_max_level_all_realms(int level) {
+        for (LogRealm realm = 0; realm < _LOG_REALM_MAX; realm++)
+                log_set_max_level_realm(realm, level);
+}
+
 void log_set_facility(int facility);
 
 int log_set_target_from_string(const char *e);
diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index d24b8d43985..19e4951a6e4 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1089,8 +1089,7 @@ static int on_ctrl_msg(struct udev_ctrl *uctrl, enum udev_ctrl_msg_type type, co
         switch (type) {
         case UDEV_CTRL_SET_LOG_LEVEL:
                 log_debug("Received udev control message (SET_LOG_LEVEL), setting log_level=%i", value->intval);
-                log_set_max_level_realm(LOG_REALM_UDEV, value->intval);
-                log_set_max_level_realm(LOG_REALM_SYSTEMD, value->intval);
+                log_set_max_level_all_realms(value->intval);
                 manager_kill_workers(manager);
                 break;
         case UDEV_CTRL_STOP_EXEC_QUEUE: