From aa976d87889ae22b7347787a1ebd03a31dcc0a9e Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Thu, 25 Apr 2024 14:09:09 +0200 Subject: [PATCH] tree-wide: Use log_setup() everywhere Otherwise the default log target is the console and we won't use the journal socket even if it is available. --- src/ac-power/ac-power.c | 3 +-- src/ask-password/ask-password.c | 4 +--- src/boot/bless-boot.c | 3 +-- src/boot/boot-check-no-failures.c | 3 +-- src/boot/measure.c | 4 +--- src/cryptenroll/cryptenroll.c | 4 +--- src/environment-d-generator/environment-d-generator.c | 3 +-- src/fuzz/fuzz.h | 3 +-- src/hwdb/hwdb.c | 3 +-- src/journal-remote/journal-remote-main.c | 3 +-- src/journal-remote/journal-upload.c | 3 +-- src/journal/bsod.c | 3 +-- src/login/inhibit.c | 4 +--- src/login/user-runtime-dir.c | 3 +-- src/machine-id-setup/machine-id-setup-main.c | 3 +-- src/mount/mount-tool.c | 4 +--- src/nspawn/nspawn.c | 3 +-- src/nsresourced/test-userns-restrict.c | 2 +- src/oom/oomctl.c | 4 +--- src/partition/repart.c | 4 +--- src/path/path.c | 4 +--- src/run/run.c | 4 +--- src/shared/generator.c | 3 +-- src/socket-activate/socket-activate.c | 4 +--- src/socket-proxy/socket-proxyd.c | 3 +-- src/stdio-bridge/stdio-bridge.c | 4 +--- src/storagetm/storagetm.c | 4 +--- src/test/test-fd-util.c | 2 +- src/udev/ata_id/ata_id.c | 6 ++---- src/udev/cdrom_id/cdrom_id.c | 6 ++---- src/udev/dmi_memory_id/dmi_memory_id.c | 6 ++---- src/udev/fido_id/fido_id.c | 6 ++---- src/udev/scsi_id/scsi_id.c | 6 ++---- src/udev/udevadm-test-builtin.c | 3 +-- src/udev/udevadm-test.c | 3 +-- src/udev/udevadm.c | 2 +- src/udev/udevd.c | 6 +----- src/vpick/vpick-tool.c | 4 +--- 38 files changed, 43 insertions(+), 99 deletions(-) diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c index fadf1dacaf2..af76b81de69 100644 --- a/src/ac-power/ac-power.c +++ b/src/ac-power/ac-power.c @@ -83,8 +83,7 @@ static int run(int argc, char *argv[]) { /* This is mostly intended to be used for scripts which want * to detect whether AC power is plugged in or not. */ - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/ask-password/ask-password.c b/src/ask-password/ask-password.c index 20285a7227d..b2c8ef70037 100644 --- a/src/ask-password/ask-password.c +++ b/src/ask-password/ask-password.c @@ -226,9 +226,7 @@ static int run(int argc, char *argv[]) { usec_t timeout; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/boot/bless-boot.c b/src/boot/bless-boot.c index 07e4e306a3e..efe1002e31f 100644 --- a/src/boot/bless-boot.c +++ b/src/boot/bless-boot.c @@ -499,8 +499,7 @@ static int run(int argc, char *argv[]) { int r; - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/boot/boot-check-no-failures.c b/src/boot/boot-check-no-failures.c index 4ff91cb9062..56c63b71a9c 100644 --- a/src/boot/boot-check-no-failures.c +++ b/src/boot/boot-check-no-failures.c @@ -79,8 +79,7 @@ static int run(int argc, char *argv[]) { uint32_t n; int r; - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/boot/measure.c b/src/boot/measure.c index 41fcd5a91ad..8c98ae1af15 100644 --- a/src/boot/measure.c +++ b/src/boot/measure.c @@ -1160,9 +1160,7 @@ static int measure_main(int argc, char *argv[]) { static int run(int argc, char *argv[]) { int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/cryptenroll/cryptenroll.c b/src/cryptenroll/cryptenroll.c index 3b16f95eb9a..2083641897b 100644 --- a/src/cryptenroll/cryptenroll.c +++ b/src/cryptenroll/cryptenroll.c @@ -797,9 +797,7 @@ static int run(int argc, char *argv[]) { size_t vks; int slot, slot_to_wipe, r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/environment-d-generator/environment-d-generator.c b/src/environment-d-generator/environment-d-generator.c index 236cf385976..fa751cbd9cc 100644 --- a/src/environment-d-generator/environment-d-generator.c +++ b/src/environment-d-generator/environment-d-generator.c @@ -84,8 +84,7 @@ static int load_and_print(void) { static int run(int argc, char *argv[]) { int r; - log_parse_environment(); - log_open(); + log_setup(); if (argc > 1) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program takes no arguments."); diff --git a/src/fuzz/fuzz.h b/src/fuzz/fuzz.h index 7afe38ed1fa..123e88e8e93 100644 --- a/src/fuzz/fuzz.h +++ b/src/fuzz/fuzz.h @@ -33,8 +33,7 @@ static inline void fuzz_setup_logging(void) { * in a fuzzing mode, so disable most of the logging. */ log_set_assert_return_is_critical(true); log_set_max_level(LOG_CRIT); - log_parse_environment(); - log_open(); + log_setup(); } /* Force value to not be optimized away. */ diff --git a/src/hwdb/hwdb.c b/src/hwdb/hwdb.c index 861dac0fd15..2ce8b2dd420 100644 --- a/src/hwdb/hwdb.c +++ b/src/hwdb/hwdb.c @@ -120,8 +120,7 @@ static int hwdb_main(int argc, char *argv[]) { static int run(int argc, char *argv[]) { int r; - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c index 545a1c62401..64f8125df3d 100644 --- a/src/journal-remote/journal-remote-main.c +++ b/src/journal-remote/journal-remote-main.c @@ -1070,8 +1070,7 @@ static int run(int argc, char **argv) { _cleanup_free_ char *cert = NULL, *trust = NULL; int r; - log_show_color(true); - log_parse_environment(); + log_setup(); /* The journal merging logic potentially needs a lot of fds. */ (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE); diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 657e574d2d3..f6b9351907e 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -764,8 +764,7 @@ static int run(int argc, char **argv) { bool use_journal; int r; - log_show_color(true); - log_parse_environment(); + log_setup(); /* The journal merging logic potentially needs a lot of fds. */ (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE); diff --git a/src/journal/bsod.c b/src/journal/bsod.c index 0da0df9ee70..b2889f02eda 100644 --- a/src/journal/bsod.c +++ b/src/journal/bsod.c @@ -305,8 +305,7 @@ static int run(int argc, char *argv[]) { _cleanup_free_ char *message = NULL; int r; - log_open(); - log_parse_environment(); + log_setup(); sigbus_install(); diff --git a/src/login/inhibit.c b/src/login/inhibit.c index 8c65e1582a4..4682830d198 100644 --- a/src/login/inhibit.c +++ b/src/login/inhibit.c @@ -257,9 +257,7 @@ static int run(int argc, char *argv[]) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/login/user-runtime-dir.c b/src/login/user-runtime-dir.c index 5f527d8c435..575f8ebfa0b 100644 --- a/src/login/user-runtime-dir.c +++ b/src/login/user-runtime-dir.c @@ -190,8 +190,7 @@ static int do_umount(const char *user) { static int run(int argc, char *argv[]) { int r; - log_parse_environment(); - log_open(); + log_setup(); if (argc != 3) return log_error_errno(SYNTHETIC_ERRNO(EINVAL), diff --git a/src/machine-id-setup/machine-id-setup-main.c b/src/machine-id-setup/machine-id-setup-main.c index bbc58945bd6..6f98f74a41d 100644 --- a/src/machine-id-setup/machine-id-setup-main.c +++ b/src/machine-id-setup/machine-id-setup-main.c @@ -139,8 +139,7 @@ static int run(int argc, char *argv[]) { _cleanup_(umount_and_freep) char *mounted_dir = NULL; int r; - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/mount/mount-tool.c b/src/mount/mount-tool.c index d8c37534d94..fcebdcaf18c 100644 --- a/src/mount/mount-tool.c +++ b/src/mount/mount-tool.c @@ -1492,9 +1492,7 @@ static int run(int argc, char* argv[]) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 8902df157f8..4fee8a693c7 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -5777,8 +5777,7 @@ static int run(int argc, char *argv[]) { _cleanup_(fw_ctx_freep) FirewallContext *fw_ctx = NULL; pid_t pid = 0; - log_parse_environment(); - log_open(); + log_setup(); arg_privileged = getuid() == 0; diff --git a/src/nsresourced/test-userns-restrict.c b/src/nsresourced/test-userns-restrict.c index 7ef1d7b4231..f509321ba89 100644 --- a/src/nsresourced/test-userns-restrict.c +++ b/src/nsresourced/test-userns-restrict.c @@ -56,7 +56,7 @@ static int run(int argc, char *argv[]) { int r; log_set_max_level(LOG_DEBUG); - log_open(); + log_setup(); r = userns_restrict_install(/* pin= */ false, &obj); if (ERRNO_IS_NOT_SUPPORTED(r)) { diff --git a/src/oom/oomctl.c b/src/oom/oomctl.c index eb15f508de0..00914f35df4 100644 --- a/src/oom/oomctl.c +++ b/src/oom/oomctl.c @@ -119,9 +119,7 @@ static int run(int argc, char* argv[]) { int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/partition/repart.c b/src/partition/repart.c index 51ae8592fde..ddacdce5b52 100644 --- a/src/partition/repart.c +++ b/src/partition/repart.c @@ -8005,9 +8005,7 @@ static int run(int argc, char *argv[]) { bool node_is_our_loop = false; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/path/path.c b/src/path/path.c index 1e69c6a3554..3ab09344b4e 100644 --- a/src/path/path.c +++ b/src/path/path.c @@ -218,9 +218,7 @@ static int parse_argv(int argc, char *argv[]) { static int run(int argc, char* argv[]) { int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/run/run.c b/src/run/run.c index 1a3b125c6f1..1f720c64420 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -2320,9 +2320,7 @@ static int run(int argc, char* argv[]) { _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); if (invoked_as(argv, "run0")) r = parse_argv_sudo_mode(argc, argv); diff --git a/src/shared/generator.c b/src/shared/generator.c index e03ed4b29fc..1b3304a7dfb 100644 --- a/src/shared/generator.c +++ b/src/shared/generator.c @@ -970,6 +970,5 @@ void log_setup_generator(void) { log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); } - log_parse_environment(); - (void) log_open(); + log_setup(); } diff --git a/src/socket-activate/socket-activate.c b/src/socket-activate/socket-activate.c index 78ecb29e606..9234bb33cdc 100644 --- a/src/socket-activate/socket-activate.c +++ b/src/socket-activate/socket-activate.c @@ -446,9 +446,7 @@ static int run(int argc, char **argv) { _cleanup_strv_free_ char **exec_argv = NULL; int r, n; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/socket-proxy/socket-proxyd.c b/src/socket-proxy/socket-proxyd.c index 287fd6c1814..dd9fa071538 100644 --- a/src/socket-proxy/socket-proxyd.c +++ b/src/socket-proxy/socket-proxyd.c @@ -676,8 +676,7 @@ static int run(int argc, char *argv[]) { _unused_ _cleanup_(notify_on_cleanup) const char *notify_stop = NULL; int r, n, fd; - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/stdio-bridge/stdio-bridge.c b/src/stdio-bridge/stdio-bridge.c index fe551cfaeaa..d3629f5fb0d 100644 --- a/src/stdio-bridge/stdio-bridge.c +++ b/src/stdio-bridge/stdio-bridge.c @@ -105,9 +105,7 @@ static int run(int argc, char *argv[]) { bool is_unix; int r, in_fd, out_fd; - log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/storagetm/storagetm.c b/src/storagetm/storagetm.c index e0609988293..1bb8eec3165 100644 --- a/src/storagetm/storagetm.c +++ b/src/storagetm/storagetm.c @@ -1111,9 +1111,7 @@ static int run(int argc, char* argv[]) { _cleanup_(context_done) Context context = {}; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/test/test-fd-util.c b/src/test/test-fd-util.c index 2796fe88823..f2b65d492a6 100644 --- a/src/test/test-fd-util.c +++ b/src/test/test-fd-util.c @@ -148,7 +148,7 @@ TEST(rearrange_stdio) { assert_se(rearrange_stdio(-EBADF, -EBADF, -EBADF) >= 0); /* Reconfigure logging after rearranging stdout/stderr, so we still log to somewhere if the * following tests fail, making it slightly less annoying to debug */ - log_set_target(LOG_TARGET_KMSG); + log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_open(); assert_se(fd_get_path(STDIN_FILENO, &path) >= 0); diff --git a/src/udev/ata_id/ata_id.c b/src/udev/ata_id/ata_id.c index 4dd7e54973a..2255eed7c42 100644 --- a/src/udev/ata_id/ata_id.c +++ b/src/udev/ata_id/ata_id.c @@ -413,10 +413,8 @@ static int run(int argc, char *argv[]) { uint16_t word; int r, peripheral_device_type = -1; - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); + (void) udev_parse_config(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/cdrom_id/cdrom_id.c b/src/udev/cdrom_id/cdrom_id.c index 9285dd81f07..195fadc5697 100644 --- a/src/udev/cdrom_id/cdrom_id.c +++ b/src/udev/cdrom_id/cdrom_id.c @@ -959,10 +959,8 @@ static int run(int argc, char *argv[]) { _cleanup_(context_clear) Context c = CONTEXT_EMPTY; int r; - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); + (void) udev_parse_config(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/dmi_memory_id/dmi_memory_id.c b/src/udev/dmi_memory_id/dmi_memory_id.c index 0393d29a733..9823df01c71 100644 --- a/src/udev/dmi_memory_id/dmi_memory_id.c +++ b/src/udev/dmi_memory_id/dmi_memory_id.c @@ -685,10 +685,8 @@ static int run(int argc, char* const* argv) { size_t size; int r; - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); + (void) udev_parse_config(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/fido_id/fido_id.c b/src/udev/fido_id/fido_id.c index e01f37d04c4..6c4b099568f 100644 --- a/src/udev/fido_id/fido_id.c +++ b/src/udev/fido_id/fido_id.c @@ -70,10 +70,8 @@ static int run(int argc, char **argv) { ssize_t desc_len; int r; - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); + (void) udev_parse_config(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c index 0f7119cd703..b63a46a730a 100644 --- a/src/udev/scsi_id/scsi_id.c +++ b/src/udev/scsi_id/scsi_id.c @@ -480,10 +480,8 @@ int main(int argc, char **argv) { char maj_min_dev[MAX_PATH_LEN]; int newargc; - log_set_target(LOG_TARGET_AUTO); - udev_parse_config(); - log_parse_environment(); - log_open(); + (void) udev_parse_config(); + log_setup(); /* * Get config file options. diff --git a/src/udev/udevadm-test-builtin.c b/src/udev/udevadm-test-builtin.c index 88319497176..322f62793f3 100644 --- a/src/udev/udevadm-test-builtin.c +++ b/src/udev/udevadm-test-builtin.c @@ -79,8 +79,7 @@ int builtin_main(int argc, char *argv[], void *userdata) { UdevBuiltinCommand cmd; int r; - log_set_max_level(LOG_DEBUG); - log_parse_environment(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/udevadm-test.c b/src/udev/udevadm-test.c index b0d2f9b20c2..c8c23e811ad 100644 --- a/src/udev/udevadm-test.c +++ b/src/udev/udevadm-test.c @@ -96,8 +96,7 @@ int test_main(int argc, char *argv[], void *userdata) { sigset_t mask, sigmask_orig; int r; - log_set_max_level(LOG_DEBUG); - log_parse_environment(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/udev/udevadm.c b/src/udev/udevadm.c index 687b927f721..899d4e6f7fb 100644 --- a/src/udev/udevadm.c +++ b/src/udev/udevadm.c @@ -123,7 +123,7 @@ static int run(int argc, char *argv[]) { if (invoked_as(argv, "udevd")) return run_udevd(argc, argv); - udev_parse_config(); + (void) udev_parse_config(); log_setup(); r = parse_argv(argc, argv); diff --git a/src/udev/udevd.c b/src/udev/udevd.c index e4087688871..5018541661d 100644 --- a/src/udev/udevd.c +++ b/src/udev/udevd.c @@ -289,8 +289,7 @@ int run_udevd(int argc, char *argv[]) { int fd_ctrl = -EBADF, fd_uevent = -EBADF; int r; - log_set_target(LOG_TARGET_AUTO); - log_open(); + log_setup(); manager = manager_new(); if (!manager) @@ -298,9 +297,6 @@ int run_udevd(int argc, char *argv[]) { manager_parse_udev_config(manager); - log_parse_environment(); - log_open(); /* Done again to update after reading configuration. */ - r = parse_argv(argc, argv, manager); if (r <= 0) return r; diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c index 0504b7733b7..c5ae8c510a4 100644 --- a/src/vpick/vpick-tool.c +++ b/src/vpick/vpick-tool.c @@ -216,9 +216,7 @@ static int parse_argv(int argc, char *argv[]) { static int run(int argc, char *argv[]) { int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup(); r = parse_argv(argc, argv); if (r <= 0) -- 2.47.3