log: introduce new helper call log_setup_service()

Let's reduce the common boilerplate and have a single setup function
used by all service code to setup logging.

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 7ca8f06234234aa9bd13db3eb61d6eac024fa98c..0bcdff53c2c1a07fd4285a7d5951f8b8b4a26cf8 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -308,9 +308,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/basic/log.c b/src/basic/log.c
index f8ef751a9355db53d108de18d5a4dbe3690a18b0..f24431eef2c8be577289802d913f9bdc96f18c2c 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1337,3 +1337,13 @@ int log_dup_console(void) {
         console_fd = copy;
         return 0;
 }
+
+void log_setup_service(void) {
+        /* Sets up logging the way it is most appropriate for running a program as a service. Note that using this
+         * doesn't make the binary unsuitable for invocation on the command line, as log output will still go to the
+         * terminal if invoked interactively. */
+
+        log_set_target(LOG_TARGET_AUTO);
+        log_parse_environment();
+        log_open();
+}

diff --git a/src/basic/log.h b/src/basic/log.h
index e1f5fd30cdbc8dac285dc7581dc9e79f81a9f062..683f97b942bbf4f6fcc4258bbe8e9e29af437eaf 100644 (file)
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -318,3 +318,5 @@ int log_syntax_invalid_utf8_internal(
         })
 
 #define DEBUG_LOGGING _unlikely_(log_get_max_level() >= LOG_DEBUG)
+
+void log_setup_service(void);

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index 9cead4a87cffa01426fa1c4ee399c3dc9b31b1d5..09f1bb39689051abf72ae58832370b62cb55cbfa 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -185,9 +185,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index 27a28d1414812968714f76a6b58c34a7d107cd0d..9721a32ed6d93449f87583bd61232d5d4c0783bc 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -23,9 +23,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
         if (fd < 0) {

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index 46536b7c845a537c63dd8005528593b7d5c19f7c..243a880542cf4bbca4efe574b3cc63bbfee11c55 100644 (file)
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -883,9 +883,7 @@ static int process_socket(int fd) {
 
         assert(fd >= 0);
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         log_debug("Processing coredump received on stdin...");
 

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 1ec40198b458662c2d5229eba90bc4a982812e77..a18b4e40f222288d9fa4ee1ee8b3af9a58fe8e8a 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -609,9 +609,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index d8b5893f76f774c4c991a05b5fd6d995f86edd39..314c8a37908fdc4a71c6677b9ed909b056df0578 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -949,9 +949,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 821ad15c5f3e6c597507dd10c8575d2a623482a1..b1ce210fcc7aaee2eb651fe8a8718faf147dfdf6 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -270,9 +270,7 @@ static int run(int argc, char *argv[]) {
         int r, exit_status;
         pid_t pid;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc > 2) {
                 log_error("This program expects one or no arguments.");

diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index abbf35729198ddf54a941461b905f29c36b14206..17e7cd1a009b96eb0c9242131f0bd58e1d5932af 100644 (file)
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -20,9 +20,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 4cbf2bde8b4dc67c168ee08eaacec407759efee1..219602c55abbb5eb8f7c758d05fd84984bcaf68d 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -707,9 +707,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
         mac_selinux_init();

diff --git a/src/import/importd.c b/src/import/importd.c
index f17cdf10d4e1d8d3a2af916168ea7623d8b21656..5d2a051533eca5ecc8fd93cbe39217f41190c8a1 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1118,9 +1118,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index c93c02bf48b26eec66366cd345f7b800b117b0f4..259908a8850fab06a7c2d936dbd2b59054121355 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -352,9 +352,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index a4e25f228498b1c0236509b5ad062df2f104417e..71553083d9db59fb99a0f021c72a2050477208e0 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -990,9 +990,7 @@ int main(int argc, char *argv[]) {
         struct MHD_Daemon *d = NULL;
         int r, n;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         r = parse_argv(argc, argv);
         if (r < 0)

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 21d1ded65cd26a166368564ea27a34b16bfd6415..bb5b132ce7fc7f3e3ad3655ba0094b7ba4c0e979 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -720,9 +720,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
         mac_selinux_init();

diff --git a/src/login/logind.c b/src/login/logind.c
index 5f2243a15d0d1ebcfcefc3fc01f33bee93cc799f..f419186506f23e404cb4fcf6f4e593c658bf17f7 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1171,10 +1171,8 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
         log_set_facility(LOG_AUTH);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/machine/machined.c b/src/machine/machined.c
index a2e7a3024051e40b7c57cb60c8d7e43124cc124f..22eb030dee6afb40fd69a9392fb5413fd7d29038 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -350,10 +350,8 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
         log_set_facility(LOG_AUTH);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index 68d91be2968c0e93aeeabd8035bcf7b5ca98ff91..0f7f4c384e1508a8d0c8150155326f2303070705 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -166,9 +166,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/network/networkd.c b/src/network/networkd.c
index d398be987f5773418108f061d9ac10d1fc6afb8c..4fa5533c6016af0cf2c33278aef3ac57ac9db016 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -17,9 +17,7 @@ int main(int argc, char *argv[]) {
         gid_t gid;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index 2ba6329a7a25a8b6eeffed92fcb63bac11aa4207..2d7459332672951b97dc5dae3daf1a775197d43a 100644 (file)
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -109,9 +109,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(manager_freep) Manager *m = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 27128494141830ffad27198ee35caee35a2bd5de..673b651da61b66afd79172eec2f36fbd39df1533 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -231,9 +231,7 @@ int main(int argc, char *argv[]) {
         struct statfs sfs;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         r = parse_argv(argc, argv);
         if (r < 0)

diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index b2702d20f737adf49da5ba6f9d671659bd2077be..22ff83dc779677379e4ed0983fd776eb6b03e78a 100644 (file)
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -49,9 +49,7 @@ static int run(int argc, char *argv[]) {
         struct stat st;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc != 3) {
                 log_error("This program expects two arguments.");

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index 313211a792165f1cb750378c081103f8f797b52b..cfaf2a59e3ece38f56a012d775f15a65f0a45d51 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -127,9 +127,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index 7b11f29507f0cdad091a1b066ca9bb88b688e2a1..0fc0052f724972ccd7d282e7356f00167cdf1998 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -56,9 +56,7 @@ static void test_files(void) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc > 1) {
                 log_error("This program takes no arguments.");

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 6162f8d6bf7273145ac1730ce632837819667248..1d2b017cf7d0acd531564863540c17794b26c3af 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -30,9 +30,7 @@ static int run(int argc, char *argv[]) {
         FILE *f;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc != 2) {
                 log_error("This program requires one argument.");

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index ece7f2955d12b0661890616d791032c6b3ec7d25..5eb1404670f0bf0cf535ad0cc1cc7787b5ab2d99 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -29,9 +29,7 @@ static int run(int argc, char *argv[]) {
         struct mntent* me;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc > 1) {
                 log_error("This program takes no arguments.");

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index bec754f7be50911cd30824aa82d0f408fed2ea94..ee7a0ea1305c144930ff74dccec4df7639f57ade 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -39,9 +39,7 @@ int main(int argc, char *argv[]) {
         size_t length = 0;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc != 3) {
                 log_error("Wrong number of arguments.");

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index fbae0b28be8a7ddabed0dfc96ae693547bb01313..755477096d59067fd0e4c89dc1c23cea12dc6c43 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -19,9 +19,7 @@ int main(int argc, char *argv[]) {
         gid_t gid;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc != 1) {
                 log_error("This program takes no arguments.");

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index 47181bfc168bb4690a27f2f1ae7d615a25f36f8b..ec8d91af7914be5a295c6bed5acf3f500cbf01e2 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -363,9 +363,7 @@ int main(int argc, char *argv[]) {
 
         LIST_HEAD_INIT(write_queue);
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/shared/generator.c b/src/shared/generator.c
index 53db27a93d38ba4a524efdea5230501aab095a8a..eba0ae8ae04329ab97259b2981cdfe348ae5e884 100644 (file)
--- a/src/shared/generator.c
+++ b/src/shared/generator.c
@@ -501,7 +501,5 @@ int generator_hook_up_growfs(
 
 void log_setup_generator(void) {
         log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 }

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index f1f4da88860c323917d9f5eb81a706d582457013..f86d4c628f17243ffbbd7962cebe1336b1ddcecb 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -358,9 +358,7 @@ static int run(int argc, char *argv[]) {
         usec_t delay = 0;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/sulogin-shell/sulogin-shell.c b/src/sulogin-shell/sulogin-shell.c
index a1ea2333de5c0cd82733276d22999c47db9921a8..82481972f08dd8269c00c30c21a8b6f36f4d65e6 100644 (file)
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -98,9 +98,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         print_mode(argc > 1 ? argv[1] : "");
 

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 9419f7bd73aa64bad923dbd9a22200233ec5139f..a9d30dea5f6b68d2557f1c2ba23c8b3e50d10c82 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -269,9 +269,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index e23360d43761e5e5e776f23347b1c5fa98d949b9..dfaff663892a345add0a708cea2efc1b6fc201d3 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1933,9 +1933,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (arg_cat_config) {
                 r = cat_config();

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 71f2f6f69b4cb2ad4ea07e9b37bd17f490f3b9b0..d23feb94f17e081662c22aa119d1e72ce9d9a7e2 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -964,9 +964,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 9a43c6193b722991f41ac7a44941105e3119db3d..405529555564647e5f7173fff07b641b0f63bfc9 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -90,10 +90,8 @@ int main(int argc, char *argv[]) {
         gid_t gid;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
         log_set_facility(LOG_CRON);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index a81cecd2f9d51825d42900181ed9992d62564285..617bcc186a9275d17eb8c3bbbede9dc1c543adbc 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -3120,9 +3120,7 @@ int main(int argc, char *argv[]) {
         if (r <= 0)
                 goto finish;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (arg_user) {
                 r = user_config_paths(&config_dirs);

diff --git a/src/tty-ask-password-agent/tty-ask-password-agent.c b/src/tty-ask-password-agent/tty-ask-password-agent.c
index 609839c5a1e20d8b21b342b353b4f43760cf12b7..0c966af499fb9fe7fb264b8a1feb3eb77ca3ccae 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -840,9 +840,7 @@ static int ask_on_consoles(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index 22faf19fa36da267088136c95edf845183ac31f6..953e0fad211413ba5d80bd85d5626e8953c1002e 100644 (file)
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -37,9 +37,7 @@ int main(int argc, char *argv[]) {
         struct stat st;
         int r, q = 0;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (stat("/usr", &st) < 0) {
                 log_error_errno(errno, "Failed to stat /usr: %m");

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 70ed723a8e90db03598ec21cb14456c0064b9193..7647aa5c74196ed23e18a3a1b5c9307b3afe3a6d 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -222,9 +222,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index 89c4b0005d901a91adbca1941f9ab01490684f98..fa0829e3848cf197e46d0beb4ba948ef82ed7f0e 100644 (file)
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -19,9 +19,7 @@ int main(int argc, char*argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index 41059bae04446c2ca066429c95db72b8c60a2df3..7182be4624382bde2e8208e8cef4d2a43aa1e89a 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -403,9 +403,7 @@ int main(int argc, char **argv) {
         unsigned idx = 0;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 61dcfd7cc2346e6acf942de29feed02abb560e50..a10baf2bfd2dac3723f06f38f299d86289470cbc 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -50,9 +50,7 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         umask(0022);
 

diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index b08d42834f9bb0fc6b67ae5ab6c8c9575a6c0fc4..70f5d957b219e9b3ba75c708b53cec22cf7600d4 100644 (file)
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -82,9 +82,7 @@ static int run(int argc, char *argv[]) {
         const char *path;
         int r;
 
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_service();
 
         if (argc > 3) {
                 log_error("Too many arguments. Expected directory and mode.");