diff options
| author | Lennart Poettering <lennart@poettering.net> | 2023-02-14 16:10:58 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2023-02-16 16:32:41 +0100 |
| commit | 1e344c1dc79d93976d019dfa0dbe6d24b28d64d7 (patch) | |
| tree | 4a0573b71bb7dfe213150a747e3b441aaab5607b /src/core/main.c | |
| parent | 05dd602e5006fbb9fd5ed586dad7db90fe7010c1 (diff) | |
| download | systemd-1e344c1dc79d93976d019dfa0dbe6d24b28d64d7.tar.gz | |
log: add common helper log_set_target_and_open()
quite often we want to set a log target and immediately open it. Add a
common helper for that.
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/main.c b/src/core/main.c index c0b8126d96..f28448f9e4 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2787,8 +2787,7 @@ int main(int argc, char *argv[]) { if (detect_container() <= 0) { /* Running outside of a container as PID 1 */ - log_set_target(LOG_TARGET_KMSG); - log_open(); + log_set_target_and_open(LOG_TARGET_KMSG); if (in_initrd()) initrd_timestamp = userspace_timestamp; @@ -2832,8 +2831,7 @@ int main(int argc, char *argv[]) { } else { /* Running inside a container, as PID 1 */ - log_set_target(LOG_TARGET_CONSOLE); - log_open(); + log_set_target_and_open(LOG_TARGET_CONSOLE); /* For later on, see above... */ log_set_target(LOG_TARGET_JOURNAL); @@ -2880,8 +2878,7 @@ int main(int argc, char *argv[]) { /* Running as user instance */ arg_system = false; log_set_always_reopen_console(true); - log_set_target(LOG_TARGET_AUTO); - log_open(); + log_set_target_and_open(LOG_TARGET_AUTO); /* clear the kernel timestamp, because we are not PID 1 */ kernel_timestamp = DUAL_TIMESTAMP_NULL; |