Merge pull request systemd#10850 from poettering/log-setup

reduce some logging boilerplate
V000V · Nov 20, 2018 · 7fa0269 · 7fa0269
2 parents ad0cdb6 + 6bf3c61
commit 7fa0269
Show file tree

Hide file tree

Showing 56 changed files with 77 additions and 167 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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/boot/bless-boot-generator.c b/src/boot/bless-boot-generator.c
@@ -5,6 +5,7 @@
 #include <unistd.h>
 
 #include "efivars.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "special.h"
@@ -21,10 +22,7 @@ static const char *arg_dest = "/tmp";
 int main(int argc, char *argv[]) {
         const char *p;
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git 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
@@ -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-generator.c b/src/cryptsetup/cryptsetup-generator.c
@@ -583,10 +583,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git 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/debug-generator/debug-generator.c b/src/debug-generator/debug-generator.c
@@ -1,6 +1,7 @@
 /* SPDX-License-Identifier: LGPL-2.1+ */
 
 #include "alloc-util.h"
+#include "generator.h"
 #include "main-func.h"
 #include "mkdir.h"
 #include "parse-util.h"
@@ -152,10 +153,7 @@ static int run(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[2];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git 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
@@ -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/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c
@@ -870,10 +870,7 @@ int main(int argc, char *argv[]) {
         if (argc > 3)
                 arg_dest_late = argv[3];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/getty-generator/getty-generator.c b/src/getty-generator/getty-generator.c
@@ -8,6 +8,7 @@
 #include "alloc-util.h"
 #include "fd-util.h"
 #include "fileio.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "path-util.h"
@@ -120,10 +121,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[1];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -679,10 +679,7 @@ int main(int argc, char *argv[]) {
         if (argc > 1)
                 arg_dest = argv[3];
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git a/src/hibernate-resume/hibernate-resume-generator.c b/src/hibernate-resume/hibernate-resume-generator.c
@@ -5,6 +5,7 @@
 
 #include "alloc-util.h"
 #include "fstab-util.h"
+#include "generator.h"
 #include "log.h"
 #include "mkdir.h"
 #include "proc-cmdline.h"
@@ -68,10 +69,7 @@ static int process_resume(void) {
 int main(int argc, char *argv[]) {
         int r = 0;
 
-        log_set_prohibit_ipc(true);
-        log_set_target(LOG_TARGET_AUTO);
-        log_parse_environment();
-        log_open();
+        log_setup_generator();
 
         umask(0022);
 

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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.");
Original file line number	Diff line number	Diff line change
Expand Up		@@ -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);