tree-wide: Use log_setup() everywhere

DaanDeMeyer · DaanDeMeyer · commit aa976d87889a · 2024-04-25T17:06:43.000+02:00
Otherwise the default log target is the console and we won't use
the journal socket even if it is available.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/src/vpick/vpick-tool.c b/src/vpick/vpick-tool.c

Original file line number	Diff line number	Diff line change
`@@ -33,8 +33,7 @@ static inline void fuzz_setup_logging(void) {`
`33`	`33`	`* in a fuzzing mode, so disable most of the logging. */`
`34`	`34`	`log_set_assert_return_is_critical(true);`
`35`	`35`	`log_set_max_level(LOG_CRIT);`
`36`		`- log_parse_environment();`
`37`		`- log_open();`
	`36`	`+ log_setup();`
`38`	`37`	`}`
`39`	`38`
`40`	`39`	`/* Force value to not be optimized away. */`