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.

diff --git a/src/ac-power/ac-power.c b/src/ac-power/ac-power.c
index fadf1dacaf2b5b5fa05d6c07321e082e36c5cb65..af76b81de69b105e790fc4150247f45da7692bd9 100644 (file)
--- 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 20285a7227dbff73ebc09f6643bb4bc91ce54d58..b2c8ef70037ebf0b015bbb095b121b4ce2c7ffc8 100644 (file)
--- 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 07e4e306a3ea83fc269a66ee1e295ffa4b374ef2..efe1002e31fb33203aa4408c5e6a7ec0c9e2e8bb 100644 (file)
--- 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 4ff91cb9062719c17971904440a23b5199d12ab7..56c63b71a9cac52b2f56c4b4f7c60c71e1742dfe 100644 (file)
--- 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 41fcd5a91ad1eafc39893afd9b5d059034609cd1..8c98ae1af15198a0178fc0769a7aa0a6ec42aa1a 100644 (file)
--- 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 3b16f95eb9a2558cfb87627e7af1693366e085a1..2083641897b714277b91ae2fc0d3d30642fecef6 100644 (file)
--- 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 236cf3859765819ec11778a53dc4f67195591d5a..fa751cbd9ccba1c54a2cf9707cd9c709e291033d 100644 (file)
--- 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 7afe38ed1fa3cc5dabc6224ddc75fe5f1864a1e8..123e88e8e938ee1aab3a3e6fd7e4e91cb91e03ed 100644 (file)
--- 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 861dac0fd154ca5e8bb9ea46c613b98d81f2014d..2ce8b2dd420429fc904dfe89e6119ce1f15122fe 100644 (file)
--- 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 545a1c624010fd09b7862d27e3045d0784e984aa..64f8125df3d3b080e21fffe6bbf3a72f33059002 100644 (file)
--- 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 657e574d2d3631141ac7e9b237f5ba27da0d5d31..f6b9351907e369ebaca3a6ae41b6bac6bcff8523 100644 (file)
--- 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 0da0df9ee701ddfb5e15230f83301108d4594614..b2889f02eda230739fd54d8d7a51d037bdfd8b9b 100644 (file)
--- 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 8c65e1582a43d8d957fd8997b08da77e9d22f646..4682830d198a8a73f14b9ad645eb390aedce930f 100644 (file)
--- 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 5f527d8c4352f36a733ae0eb922483d824840cd9..575f8ebfa0b481b4f5b7cfcefda69abbbb9f1053 100644 (file)
--- 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 bbc58945bd6e3d48682c408852784bb7dc293860..6f98f74a41d56923e108d4333d1759c3f8ab2c4c 100644 (file)
--- 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 d8c37534d94e898f0ed052b1e5e850e1ecfb8cd0..fcebdcaf18c9bcc862e6e971c3dfa371480fd83e 100644 (file)
--- 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 8902df157f8bd7cc6a83464a8c6bde6034ed0556..4fee8a693c75d8f228e68b312acdec7c61b4e712 100644 (file)
--- 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 7ef1d7b42314c0f6bc0e32a3b8ed5d35c0de14c7..f509321ba89a41273908cb10c2d6a990e80454d7 100644 (file)
--- 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 eb15f508de00fcaf1edaec25ee97d39f7b004fa2..00914f35df4af4b1b965de4e47e3b5c1b727f06a 100644 (file)
--- 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 51ae8592fdefe7440ef67e456fd64923ea3c8646..ddacdce5b52c04a6dabdcd169c868bb30c85f281 100644 (file)
--- 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 1e69c6a355400bbf59475ee2c1b9c7fca58e6c72..3ab09344b4e3cce9b0ce6c71da69ef965f4663be 100644 (file)
--- 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 1a3b125c6f10f31f0d1094365c53349972338f1e..1f720c64420b7d8a12594a1e1e9e18f41c20569c 100644 (file)
--- 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 e03ed4b29fce206175b9a592c5410977e1c0e520..1b3304a7dfbe2e666435b65eddd70ef3faaae597 100644 (file)
--- 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 78ecb29e60624a01119a4b7b7c60f19dcc9bdf71..9234bb33cdc590d758b7101f80f0a804d4e6aa16 100644 (file)
--- 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 287fd6c181465b839eeaaaaacccb215567b20a60..dd9fa071538d5f490a8ae1de155d389a6460f4fe 100644 (file)
--- 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 fe551cfaeaaa6be3fd85a4c425243561fb63d174..d3629f5fb0dc5baa44f08ecfb38c8c42126476da 100644 (file)
--- 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 e0609988293705c21d368d413089c770c8efd723..1bb8eec3165d5b8be887b485ae9af39b0b7854b1 100644 (file)
--- 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 2796fe888238a5dbe1734b5fee5b5ccd21c08d3d..f2b65d492a63a043589b41bcd1880788823c2b8a 100644 (file)
--- 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 4dd7e54973ab11c247448a87cffd1ec4a09d6718..2255eed7c4224714943044b8e7e80dd1a62b0a77 100644 (file)
--- 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 9285dd81f075ac0cc776ec1af2a90e2258ff2bfa..195fadc5697e81f19273f0228d07a87d6de4f5bf 100644 (file)
--- 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 0393d29a733cb510e1f3e6bb64da0cf15f78e1e3..9823df01c71c22d2aaa90460aa3de3ede463bf60 100644 (file)
--- 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 e01f37d04c4c372b35968e191d522bcc30de372c..6c4b099568fe73d150bd9ef7ae1d62cb479b1313 100644 (file)
--- 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 0f7119cd703a0ee4d41dbfd225b8d0f09869f447..b63a46a730ae4e887e22529adc40e79582a02235 100644 (file)
--- 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 88319497176d0f2d4304597e2e08cc3113dbe06b..322f62793f34d53032b0cdc9c84c029c64064b97 100644 (file)
--- 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 b0d2f9b20c229e46ca01174f64bec45dc2f18727..c8c23e811adf72e82927d36d64c4ceed7d65cb74 100644 (file)
--- 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 687b927f721d1cff95c4d8e4830465e3aba0e4fc..899d4e6f7fb3fbc62a1ae7b1300f999c8446df78 100644 (file)
--- 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 e408768887145a69eb5eb3f5e7af24b972ab43dc..5018541661d1e131943d0955560a49f524ea0c8a 100644 (file)
--- 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 0504b7733b7e91a9214c844b1dacbb32aca6bf9d..c5ae8c510a4448300c19ce67466ba97e0aad28af 100644 (file)
--- 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)