]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
Fix generator logging
authorDaan De Meyer <daan.j.demeyer@gmail.com>
Mon, 16 Sep 2024 19:45:55 +0000 (21:45 +0200)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 17 Sep 2024 06:10:39 +0000 (15:10 +0900)
log_setup() overrides the previously set log target again so we
can't use it in log_setup_generator().

Follow-up for aa976d87889ae22b7347787a1ebd03a31dcc0a9e

src/shared/generator.c

index 1b3304a7dfbe2e666435b65eddd70ef3faaae597..bff44cfc15d82cd13dfcd2b9a470e10597e508e9 100644 (file)
@@ -968,7 +968,9 @@ void log_setup_generator(void) {
 
                 /* This effectively means: journal for per-user generators, kmsg otherwise */
                 log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
-        }
+        } else
+                log_set_target(LOG_TARGET_AUTO);
 
-        log_setup();
+        log_parse_environment();
+        log_open();
 }