From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 20 Jan 2025 19:03:05 +0000 (+0900)
Subject: udev-control: move setting of log level to manager_adjust_config()
X-Git-Tag: v258-rc1~1547^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5a10b2127207c6ddb64ed05d01bc211ccef2981;p=thirdparty%2Fsystemd.git

udev-control: move setting of log level to manager_adjust_config()

No functional change, just refactoring.
---

diff --git a/src/udev/udev-config.c b/src/udev/udev-config.c
index e60464360db..5c963e4ffdd 100644
--- a/src/udev/udev-config.c
+++ b/src/udev/udev-config.c
@@ -320,6 +320,8 @@ void manager_set_log_level(Manager *manager, int log_level) {
 static void manager_adjust_config(UdevConfig *config) {
         assert(config);
 
+        log_set_max_level(config->log_level);
+
         if (config->timeout_usec < MIN_WORKER_TIMEOUT_USEC) {
                 log_debug("Timeout (%s) for processing event is too small, using the default: %s",
                           FORMAT_TIMESPAN(config->timeout_usec, 1),
@@ -411,7 +413,6 @@ int manager_load(Manager *manager, int argc, char *argv[]) {
         if (arg_debug)
                 log_set_target(LOG_TARGET_CONSOLE);
 
-        log_set_max_level(manager->config.log_level);
         manager_adjust_config(&manager->config);
         return 1;
 }
@@ -424,7 +425,6 @@ UdevReloadFlags manager_reload_config(Manager *manager) {
         manager->config_by_udev_conf = UDEV_CONFIG_INIT;
         manager_parse_udev_config(&manager->config_by_udev_conf);
         manager_merge_config(manager);
-        log_set_max_level(manager->config.log_level);
         manager_adjust_config(&manager->config);
 
         if (manager->config.resolve_name_timing != old.resolve_name_timing)