tree-wide: enable colorized logging for daemons when run in console

It may be useful when debugging daemons.

diff --git a/src/analyze/analyze.c b/src/analyze/analyze.c
index 31718afebdad233a0bd7a3fd673880750b0a647e..3b953ac4720f10bd6920e1e5e87d56686f274c4b 100644 (file)
--- a/src/analyze/analyze.c
+++ b/src/analyze/analyze.c
@@ -2446,7 +2446,7 @@ static int run(int argc, char *argv[]) {
         setlocale(LC_ALL, "");
         setlocale(LC_NUMERIC, "C"); /* we want to format/parse floats in C style */
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/backlight/backlight.c b/src/backlight/backlight.c
index 717f0475caca1b9f8da4369f6513e76f571e6f26..f3d53d64625157274340b3fa969a6ecdbd41022f 100644 (file)
--- a/src/backlight/backlight.c
+++ b/src/backlight/backlight.c
@@ -380,7 +380,7 @@ static int run(int argc, char *argv[]) {
         unsigned max_brightness, brightness;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (strv_contains(strv_skip(argv, 1), "--help"))
                 return help();

diff --git a/src/basic/log.c b/src/basic/log.c
index 4163f2e8d93ddf6ce7ede4fa1fd67c57f37ab5e4..f2cd1c30410568d2d5667e7430eb0937fe46dd6d 100644 (file)
--- a/src/basic/log.c
+++ b/src/basic/log.c
@@ -1456,19 +1456,7 @@ int log_dup_console(void) {
         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();
-        (void) log_open();
-}
-
-void log_setup_cli(void) {
-        /* Sets up logging the way it is most appropriate for running a program as a CLI utility. */
-
+void log_setup(void) {
         log_set_target(LOG_TARGET_AUTO);
         log_parse_environment();
         (void) log_open();

diff --git a/src/basic/log.h b/src/basic/log.h
index 9421fc8b4942b3515e86ae165d3b46d809ab75eb..60e67270dbd8fde287e83f3cff0a19b3d49f3db9 100644 (file)
--- a/src/basic/log.h
+++ b/src/basic/log.h
@@ -300,5 +300,4 @@ int log_syntax_invalid_utf8_internal(
 
 #define DEBUG_LOGGING _unlikely_(log_get_max_level() >= LOG_DEBUG)
 
-void log_setup_service(void);
-void log_setup_cli(void);
+void log_setup(void);

diff --git a/src/binfmt/binfmt.c b/src/binfmt/binfmt.c
index ecb9d90a7819e6e7224c063f4d4e2c80fdb1e296..f6b72e0bae865f3402716938f4298583aa4545e0 100644 (file)
--- a/src/binfmt/binfmt.c
+++ b/src/binfmt/binfmt.c
@@ -190,7 +190,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 02648957db1f775894aca2bccde13c2362485807..7774aeac7c2e0bfab8a03eee69999774e7af799f 100644 (file)
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -2565,7 +2565,7 @@ static int busctl_main(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/cgls/cgls.c b/src/cgls/cgls.c
index 30fd743d11c32a99440ad64ceeffd07f9fc74685..6868049c18f36a4b0d979c2f726e7440047afda5 100644 (file)
--- a/src/cgls/cgls.c
+++ b/src/cgls/cgls.c
@@ -163,7 +163,7 @@ static void show_cg_info(const char *controller, const char *path) {
 static int run(int argc, char *argv[]) {
         int r, output_flags;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
index eeb4ba80f5f2f734e7bd39274675615f86249033..071cba30996e855d83bdad59ca8917234341dc4a 100644 (file)
--- a/src/cgroups-agent/cgroups-agent.c
+++ b/src/cgroups-agent/cgroups-agent.c
@@ -22,7 +22,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_setup_service();
+        log_setup();
 
         fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC, 0);
         if (fd < 0) {

diff --git a/src/cgtop/cgtop.c b/src/cgtop/cgtop.c
index f63a7173e661d34db132234e1445002899b0ec18..d0fa69ff88dca9deaafe10fe674e31db8a226d30 100644 (file)
--- a/src/cgtop/cgtop.c
+++ b/src/cgtop/cgtop.c
@@ -915,7 +915,7 @@ static int run(int argc, char *argv[]) {
         CGroupMask mask;
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/coredump/coredump.c b/src/coredump/coredump.c
index d546e1b8f666a02392932fb14406306d033cb55a..bc8d34952beda4b9803bc24663836e7ea37eb35f 100644 (file)
--- a/src/coredump/coredump.c
+++ b/src/coredump/coredump.c
@@ -861,7 +861,7 @@ static int process_socket(int fd) {
 
         assert(fd >= 0);
 
-        log_setup_service();
+        log_setup();
 
         log_debug("Processing coredump received on stdin...");
 

diff --git a/src/coredump/coredumpctl.c b/src/coredump/coredumpctl.c
index 20bd97c1fce98e40aa3b37919433dec6658ed5b1..55283a93ae28d60f6063d011defcc1965d446409 100644 (file)
--- a/src/coredump/coredumpctl.c
+++ b/src/coredump/coredumpctl.c
@@ -1108,7 +1108,7 @@ static int run(int argc, char *argv[]) {
         int r, units_active;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         /* The journal merging logic potentially needs a lot of fds. */
         (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);

diff --git a/src/cryptsetup/cryptsetup.c b/src/cryptsetup/cryptsetup.c
index 9cef31398f1355eb2f8c423545b92c29dfd9ba22..2df7633dac7fb77b4f9aa44f3d8036c15de4587b 100644 (file)
--- a/src/cryptsetup/cryptsetup.c
+++ b/src/cryptsetup/cryptsetup.c
@@ -1395,7 +1395,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "This program requires at least two arguments.");
 
-        log_setup_service();
+        log_setup();
 
         cryptsetup_enable_logging(cd);
 

diff --git a/src/delta/delta.c b/src/delta/delta.c
index a50cb36ee3915f1621b445b369fb2b717d851aa9..21be1b8f549fdf070e7930a7f7ee0a6793c8fefc 100644 (file)
--- a/src/delta/delta.c
+++ b/src/delta/delta.c
@@ -643,7 +643,7 @@ static int parse_argv(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r, k, n_found = 0;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/detect-virt/detect-virt.c b/src/detect-virt/detect-virt.c
index be0db85d7cec749e0511f29ce1c5a3812fe844b6..bfdede6ce7a5c05fe0697caaa1649a4366016791 100644 (file)
--- a/src/detect-virt/detect-virt.c
+++ b/src/detect-virt/detect-virt.c
@@ -127,7 +127,7 @@ static int run(int argc, char *argv[]) {
          * to detect whether we are being run in a virtualized
          * environment or not */
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/escape/escape.c b/src/escape/escape.c
index 24c53bf14b33ee5be1a6adb03d0aac1a292cf97f..a2fdce790eef8581b837e8d634b1d2623aeaf821 100644 (file)
--- a/src/escape/escape.c
+++ b/src/escape/escape.c
@@ -158,7 +158,7 @@ static int run(int argc, char *argv[]) {
         char **i;
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
index 6982cf2eed6c118d633a8b1f0fb8d44c6bb7035b..904612ab4a61c39a9c49949805fe511a28b8db0d 100644 (file)
--- a/src/firstboot/firstboot.c
+++ b/src/firstboot/firstboot.c
@@ -1271,7 +1271,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c
index 04752fe9dc6fe86bcbc4789868d8ca5a00c799e2..cd012f0f3ae49dec94cb6ef68f663e0ab10ec3ae 100644 (file)
--- a/src/fsck/fsck.c
+++ b/src/fsck/fsck.c
@@ -256,7 +256,7 @@ static int run(int argc, char *argv[]) {
         int r, exit_status;
         pid_t pid;
 
-        log_setup_service();
+        log_setup();
 
         if (argc > 2)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

diff --git a/src/hibernate-resume/hibernate-resume.c b/src/hibernate-resume/hibernate-resume.c
index d8f91f4e663f36a230aaac729e190148e1618217..58e35e403ebec5ca8b99f95804eb9583996fd9a2 100644 (file)
--- a/src/hibernate-resume/hibernate-resume.c
+++ b/src/hibernate-resume/hibernate-resume.c
@@ -20,7 +20,7 @@ int main(int argc, char *argv[]) {
                 return EXIT_FAILURE;
         }
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/home/homectl.c b/src/home/homectl.c
index 0b4148989783639dda904238f1bf72d156ee72be..176f041114c0f13f125bda72be3afdc8144edcfe 100644 (file)
--- a/src/home/homectl.c
+++ b/src/home/homectl.c
@@ -3346,7 +3346,7 @@ static int run(int argc, char *argv[]) {
 
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = redirect_bus_mgr();
         if (r < 0)

diff --git a/src/home/homed.c b/src/home/homed.c
index e4d64bdfda15d0fab6c68fcd397323ed085cd644..807d25e2735a235192ddefd000e2ed6b0a1785d1 100644 (file)
--- a/src/home/homed.c
+++ b/src/home/homed.c
@@ -17,7 +17,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-homed.service",
                                "A service to create, remove, change or inspect home areas.",

diff --git a/src/home/homework.c b/src/home/homework.c
index 35f3206bb0a104289acf2c622f9dbd038b229b98..bb5a774f81c0992547965f1e2db189547054b97b 100644 (file)
--- a/src/home/homework.c
+++ b/src/home/homework.c
@@ -1633,7 +1633,7 @@ static int run(int argc, char *argv[]) {
 
         start = now(CLOCK_MONOTONIC);
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c
index 4482608b285dcb258d3874f47be329bb8b7f743a..62da90b12128f9546fdea1c7c6ea39f520e22d79 100644 (file)
--- a/src/hostname/hostnamectl.c
+++ b/src/hostname/hostnamectl.c
@@ -443,7 +443,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
index 35c2c37f92435056b87d5b5c2c263a346f1b3602..0e4dd02b49fdf029f8e7c4b7761c2c3ec89ac299 100644 (file)
--- a/src/hostname/hostnamed.c
+++ b/src/hostname/hostnamed.c
@@ -1064,7 +1064,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-hostnamed.service",
                                "Manage the system hostname and related metadata.",

diff --git a/src/id128/id128.c b/src/id128/id128.c
index 70ea4d0a690f6e070a4005e8f93e9f6849ba5edf..435a56d4f34de47a5bcdf139ff29cec20d984923 100644 (file)
--- a/src/id128/id128.c
+++ b/src/id128/id128.c
@@ -249,7 +249,7 @@ static int id128_main(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/import/importd.c b/src/import/importd.c
index 15914cc8853b5afd9e1f4eab3f9b3c94a445c541..345fc7c2cb204544e42cc961ca6a7b3144aa564a 100644 (file)
--- a/src/import/importd.c
+++ b/src/import/importd.c
@@ -1361,7 +1361,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-importd.service",
                                "VM and container image import and export service.",

diff --git a/src/initctl/initctl.c b/src/initctl/initctl.c
index e0b78334f5d3cdbb1331020d7c12d266ba897f0a..d818f452f7f1a39271ac0dd6dc2dd65f70bf03e6 100644 (file)
--- a/src/initctl/initctl.c
+++ b/src/initctl/initctl.c
@@ -317,7 +317,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "This program does not take arguments.");
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/journal-remote/journal-gatewayd.c b/src/journal-remote/journal-gatewayd.c
index 17216c8e20c8ca40f52f2a61de3dcab2160aff5a..4ece66b51bb62b7ae7539872736c372dffef04ac 100644 (file)
--- a/src/journal-remote/journal-gatewayd.c
+++ b/src/journal-remote/journal-gatewayd.c
@@ -995,7 +995,7 @@ static int run(int argc, char *argv[]) {
                 MHD_USE_THREAD_PER_CONNECTION;
         int r, n;
 
-        log_setup_service();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/journal/cat.c b/src/journal/cat.c
index 223af8da1edd00acf8319daf012dc3f00fbd1415..6599e64296a79303aa78bf1be593099d0cbfdecc 100644 (file)
--- a/src/journal/cat.c
+++ b/src/journal/cat.c
@@ -129,7 +129,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_close_ int outfd = -1, errfd = -1, saved_stderr = -1;
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index dee0a0835b1030dc030f23e75046dcea5bdf549d..94fc3472beca3ec45690d2884888c3ad4f3d8d76 100644 (file)
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2145,7 +2145,7 @@ int main(int argc, char *argv[]) {
         int n_shown = 0, r, poll_fd = -1;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         /* Increase max number of open files if we can, we might needs this when browsing journal files, which might be
          * split up into many files. */

diff --git a/src/locale/localectl.c b/src/locale/localectl.c
index 692a259275d55f0f5bb116e1eeecb37f7bbe400d..c267db9edd9a6c7bbf5f57be23f0483f1820615a 100644 (file)
--- a/src/locale/localectl.c
+++ b/src/locale/localectl.c
@@ -506,7 +506,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/locale/localed.c b/src/locale/localed.c
index 12073bd6f38bb41a918e2509e9d8f26162110b69..97d6592cb81401421a28043d2eeea52d0857770b 100644 (file)
--- a/src/locale/localed.c
+++ b/src/locale/localed.c
@@ -830,7 +830,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-localed.service",
                                "Manage system locale settings and key mappings.",

diff --git a/src/login/loginctl.c b/src/login/loginctl.c
index 995bcbff760f20deadcbe90c501792d84bb8e12e..f61f9eca04e01b708d2aaf5adcbdce09a1e8c59b 100644 (file)
--- a/src/login/loginctl.c
+++ b/src/login/loginctl.c
@@ -1464,7 +1464,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         /* The journal merging logic potentially needs a lot of fds. */
         (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);

diff --git a/src/login/logind.c b/src/login/logind.c
index 3ddc7a074af521a6b71f6f9ed564fb9f827b6fe1..3dae6955548459363898e6c49269274c7bdcacd9 100644 (file)
--- a/src/login/logind.c
+++ b/src/login/logind.c
@@ -1160,7 +1160,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         log_set_facility(LOG_AUTH);
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-logind.service",
                                "Manager for user logins and devices and privileged operations.",

diff --git a/src/machine/machinectl.c b/src/machine/machinectl.c
index e254e255599571dfee99a06754b560b037e4f17a..1771abc07759fd661e8abcda4abe347449c9fdd9 100644 (file)
--- a/src/machine/machinectl.c
+++ b/src/machine/machinectl.c
@@ -2876,7 +2876,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         /* The journal merging logic potentially needs a lot of fds. */
         (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);

diff --git a/src/machine/machined.c b/src/machine/machined.c
index 6a5bf391e6b24d477d302c215315e697210a3157..e9e6a6270ac1d644ef10cf6620ad50292ec6c483 100644 (file)
--- a/src/machine/machined.c
+++ b/src/machine/machined.c
@@ -324,7 +324,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         log_set_facility(LOG_AUTH);
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-machined.service",
                                "Manage registrations of local VMs and containers.",

diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
index ba690f52cabef28fbcb588de972367cfd68a70bc..9cfd292011602d00427d83b5308b3b8e6a415a3a 100644 (file)
--- a/src/modules-load/modules-load.c
+++ b/src/modules-load/modules-load.c
@@ -165,7 +165,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/network/networkctl.c b/src/network/networkctl.c
index 3b9a7d6485eeafc0519751cae6297653c2df3355..4381f63a2d0af2aa9c0d0cef250e3e424b8d9946 100644 (file)
--- a/src/network/networkctl.c
+++ b/src/network/networkctl.c
@@ -2822,7 +2822,7 @@ static void warn_networkd_missing(void) {
 static int run(int argc, char* argv[]) {
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/network/networkd.c b/src/network/networkd.c
index ac2bc90d974f3ed8cbfb201714b1a543b42cf897..24b3cb57af9a70c94825aa8f9dd075836e2aa11f 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -22,7 +22,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/network/wait-online/wait-online.c b/src/network/wait-online/wait-online.c
index 2de3e79c3c79d393502d794a7a896f2c317c3b2b..ca0116e7f307278908d062f944b8bfb7ae106e9f 100644 (file)
--- a/src/network/wait-online/wait-online.c
+++ b/src/network/wait-online/wait-online.c
@@ -184,7 +184,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(notify_on_cleanup) const char *notify_message = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/oom/oomd.c b/src/oom/oomd.c
index 3f3ef944ee17988db07b9fc345da2100ee5b4ac0..28e059fbde227da689424ad2b184354d21eaddd4 100644 (file)
--- a/src/oom/oomd.c
+++ b/src/oom/oomd.c
@@ -122,7 +122,7 @@ static int run(int argc, char *argv[]) {
         unsigned long long s = 0;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/partition/growfs.c b/src/partition/growfs.c
index 367644e3c9ecc38e7aebb5411be4570c86ddefaf..15c56d058437d7c33ac19c9a3f2e60857b4274b1 100644 (file)
--- a/src/partition/growfs.c
+++ b/src/partition/growfs.c
@@ -201,7 +201,7 @@ static int run(int argc, char *argv[]) {
         dev_t devno;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/partition/makefs.c b/src/partition/makefs.c
index fd924d2231cdf3c6fcca628b910132dd3c32a219..7c94fbfedb109fc91f7712082b257ed3c27a684c 100644 (file)
--- a/src/partition/makefs.c
+++ b/src/partition/makefs.c
@@ -24,7 +24,7 @@ static int run(int argc, char *argv[]) {
         struct stat st;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc != 3)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

diff --git a/src/portable/portablectl.c b/src/portable/portablectl.c
index 0b329134de5926ca64206b1c18e72babef97f08c..e9c4fae59ba8c7550dcdeea178bc15f5316afafe 100644 (file)
--- a/src/portable/portablectl.c
+++ b/src/portable/portablectl.c
@@ -1113,7 +1113,7 @@ static int run(int argc, char *argv[]) {
 
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/portable/portabled.c b/src/portable/portabled.c
index f008f84e53cc371cf27d503348907d9e0b65f89f..8a17f09365abeee92770857fbe1ad33a9b4bcc57 100644 (file)
--- a/src/portable/portabled.c
+++ b/src/portable/portabled.c
@@ -135,7 +135,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(manager_unrefp) Manager *m = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/pstore/pstore.c b/src/pstore/pstore.c
index db8a71fbab20f4c88b510d2a8813e7cfc5c2c134..c642a3252cbbdb02f83a32872a173882144e16bc 100644 (file)
--- a/src/pstore/pstore.c
+++ b/src/pstore/pstore.c
@@ -367,7 +367,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(pstore_entries_reset) PStoreList list = {};
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc == 3) {
                 arg_sourcedir = argv[1];

diff --git a/src/quotacheck/quotacheck.c b/src/quotacheck/quotacheck.c
index d617b0bf3d6f2459549a4d7cde3e356610e5a966..575965c470ea463a288291c6b22760a97e4a73fc 100644 (file)
--- a/src/quotacheck/quotacheck.c
+++ b/src/quotacheck/quotacheck.c
@@ -58,7 +58,7 @@ static void test_files(void) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc > 1)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

diff --git a/src/random-seed/random-seed.c b/src/random-seed/random-seed.c
index 8f8766cdd7046391fcfc4ae9d628c7cdb7f328e0..4caf9678071ac5e534dc838df8448830c8894265 100644 (file)
--- a/src/random-seed/random-seed.c
+++ b/src/random-seed/random-seed.c
@@ -110,7 +110,7 @@ static int run(int argc, char *argv[]) {
         ssize_t k;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc != 2)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

diff --git a/src/remount-fs/remount-fs.c b/src/remount-fs/remount-fs.c
index 9668a49dc464c29e4721deaf350078dc3663b001..d747d60d5dbc343e0758600e60d52f4d680988a0 100644 (file)
--- a/src/remount-fs/remount-fs.c
+++ b/src/remount-fs/remount-fs.c
@@ -77,7 +77,7 @@ static int run(int argc, char *argv[]) {
         struct mntent* me;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc > 1)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),

diff --git a/src/reply-password/reply-password.c b/src/reply-password/reply-password.c
index a73334e2b8808b363edc731bd0a15f9d671f4bd6..a9aa4b832a966636201717b4d646d273c2c4b64d 100644 (file)
--- a/src/reply-password/reply-password.c
+++ b/src/reply-password/reply-password.c
@@ -39,7 +39,7 @@ static int run(int argc, char *argv[]) {
         size_t length = 0;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc != 3)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Wrong number of arguments.");

diff --git a/src/resolve/resolvectl.c b/src/resolve/resolvectl.c
index b1779a6418a43c8a8865f9688893dcde69ab1be8..318528b419c9ef34fa750e926368f699327fd9c2 100644 (file)
--- a/src/resolve/resolvectl.c
+++ b/src/resolve/resolvectl.c
@@ -3296,7 +3296,7 @@ static int run(int argc, char **argv) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         if (streq(program_invocation_short_name, "resolvconf"))
                 r = resolvconf_parse_argv(argc, argv);

diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c
index 4c42b6591d03809965d8651ceb4f44c4bf7d75b7..aabaa266e99cef9a3e8f2d2a9d6473f55ddda762 100644 (file)
--- a/src/resolve/resolved.c
+++ b/src/resolve/resolved.c
@@ -26,7 +26,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-resolved.service",
                                "Provide name resolution with caching using DNS, mDNS, LLMNR.",

diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c
index c38716842b2f1099954fad50019195161a555b7e..91dc72f425fe71613b8373c481d65b6c91706052 100644 (file)
--- a/src/rfkill/rfkill.c
+++ b/src/rfkill/rfkill.c
@@ -276,7 +276,7 @@ static int run(int argc, char *argv[]) {
         if (argc > 1)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program requires no arguments.");
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
index 297cc1fec69271d41f5bfa14df0707a92f274509..262d4cea66a290aa71e49419113d78b786c42c36 100644 (file)
--- a/src/sleep/sleep.c
+++ b/src/sleep/sleep.c
@@ -368,7 +368,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(free_sleep_configp) SleepConfig *sleep_config = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         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 b0d71ff580c40f597115019a2a276ab74224b2a1..0207e85b7ef8f4b2139d1a3b98546d5e012091e5 100644 (file)
--- a/src/sulogin-shell/sulogin-shell.c
+++ b/src/sulogin-shell/sulogin-shell.c
@@ -100,7 +100,7 @@ int main(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         print_mode(argc > 1 ? argv[1] : "");
 

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 6d20ee1a84b07e38c410c70a68614932dcbaa4af..1b433f70450d6986ebc68b6ceff55f69e6a340c9 100644 (file)
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -386,7 +386,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/sysext/sysext.c b/src/sysext/sysext.c
index 601fd63a1442a573c816ce02e21546eb12f39dc8..bfb9631bc8a254933499b7875100a4fdacdd4043 100644 (file)
--- a/src/sysext/sysext.c
+++ b/src/sysext/sysext.c
@@ -1027,7 +1027,7 @@ static int sysext_main(int argc, char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/sysusers/sysusers.c b/src/sysusers/sysusers.c
index 25a1871bd4c0145d63b5d8fe391166ee42cc6602..969896c0b5d87e717f7172b523d642c0ab6933ac 100644 (file)
--- a/src/sysusers/sysusers.c
+++ b/src/sysusers/sysusers.c
@@ -1928,7 +1928,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        log_setup_service();
+        log_setup();
 
         if (arg_cat_config)
                 return cat_config();

diff --git a/src/test/test-chase-symlinks.c b/src/test/test-chase-symlinks.c
index d9b9b62dc5a5c00b4b813fbb39044b342887c15b..892f8a073ff5328d25d81fa223f78457afbc016e 100644 (file)
--- a/src/test/test-chase-symlinks.c
+++ b/src/test/test-chase-symlinks.c
@@ -84,7 +84,7 @@ static int parse_argv(int argc, char *argv[]) {
 static int run(int argc, char **argv) {
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/timedate/timedatectl.c b/src/timedate/timedatectl.c
index 7088a771a65853dbc9fcf1cb2babfbcc1c1e8257..fb08f9ad260867ec101e1bb1632657665e9e329a 100644 (file)
--- a/src/timedate/timedatectl.c
+++ b/src/timedate/timedatectl.c
@@ -1051,7 +1051,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         setlocale(LC_ALL, "");
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
index 8149facb346396fff9f18b08860369722c980289..563f470f54e3142ce65f129c3c6eab44befd92ba 100644 (file)
--- a/src/timedate/timedated.c
+++ b/src/timedate/timedated.c
@@ -1109,7 +1109,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(sd_bus_flush_close_unrefp) sd_bus *bus = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         r = service_parse_argv("systemd-timedated.service",
                                "Manage the system clock and timezone and NTP enablement.",

diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
index 1f59bf14e1aa59bc03dfe5bd74344d61c85a1ae7..e6a2b06687346460d526c77be00a324f8613a246 100644 (file)
--- a/src/timesync/timesyncd.c
+++ b/src/timesync/timesyncd.c
@@ -97,7 +97,7 @@ static int run(int argc, char *argv[]) {
         int r;
 
         log_set_facility(LOG_CRON);
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index b033def9dffbc4896b40448c395bdf1bf6e2a206..8ad886236d2d890bd926fea216e2c36fd49e9db3 100644 (file)
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -3363,7 +3363,7 @@ static int run(int argc, char *argv[]) {
         if (r <= 0)
                 return r;
 
-        log_setup_service();
+        log_setup();
 
         /* Descending down file system trees might take a lot of fds */
         (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE);

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 5695327024a8e2f38e4c6ff3435defed7dc75eb2..ee66a3c312a1e4ee3d1768b408302e3cacdf313f 100644 (file)
--- a/src/tty-ask-password-agent/tty-ask-password-agent.c
+++ b/src/tty-ask-password-agent/tty-ask-password-agent.c
@@ -684,7 +684,7 @@ static int ask_on_consoles(char *argv[]) {
 static int run(int argc, char *argv[]) {
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/update-done/update-done.c b/src/update-done/update-done.c
index 212892527e6ad55a13e5c1e0944f9b87e57e7c84..6518830717ecc0967db685f9c68ca26e286cec62 100644 (file)
--- a/src/update-done/update-done.c
+++ b/src/update-done/update-done.c
@@ -41,7 +41,7 @@ int main(int argc, char *argv[]) {
         struct stat st;
         int r, q = 0;
 
-        log_setup_service();
+        log_setup();
 
         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 59c49f2a8019c5e9cc5aba4071ca086df116011a..1ec9066d345b876b03506fe9b91302f2b6f723ef 100644 (file)
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -224,7 +224,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "This program requires one argument.");
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/user-sessions/user-sessions.c b/src/user-sessions/user-sessions.c
index d1b8176714ed8b8a90525408904087be17ead65d..6b7493fd8853a18a5f4ce6cb20084c5ed8e9ffbd 100644 (file)
--- a/src/user-sessions/user-sessions.c
+++ b/src/user-sessions/user-sessions.c
@@ -21,7 +21,7 @@ static int run(int argc, char *argv[]) {
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                        "This program requires one argument.");
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/userdb/userdbctl.c b/src/userdb/userdbctl.c
index ecaead39d76a58b54169a572a4acd31533f60550..5dc1cf8140b0096ee1dcb8caa62f5cfba363c7af 100644 (file)
--- a/src/userdb/userdbctl.c
+++ b/src/userdb/userdbctl.c
@@ -763,7 +763,7 @@ static int run(int argc, char *argv[]) {
 
         int r;
 
-        log_setup_cli();
+        log_setup();
 
         r = parse_argv(argc, argv);
         if (r <= 0)

diff --git a/src/userdb/userdbd.c b/src/userdb/userdbd.c
index 6f2c8078432bb20be0ccbe5f988606eacb9e0fb1..6b28dd0a084d7aa2c7dade03d72cfa54f4ad5211 100644 (file)
--- a/src/userdb/userdbd.c
+++ b/src/userdb/userdbd.c
@@ -24,7 +24,7 @@ static int run(int argc, char *argv[]) {
         _cleanup_(notify_on_cleanup) const char *notify_stop = NULL;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/userdb/userwork.c b/src/userdb/userwork.c
index d525a6e05afad2d9817c9d7d982f5df672d2dcea..c62a21974a1e4ae499aa97af5092e1d0f7297c90 100644 (file)
--- a/src/userdb/userwork.c
+++ b/src/userdb/userwork.c
@@ -662,7 +662,7 @@ static int run(int argc, char *argv[]) {
         unsigned n_iterations = 0;
         int m, listen_fd, r;
 
-        log_setup_service();
+        log_setup();
 
         m = sd_listen_fds(false);
         if (m < 0)

diff --git a/src/vconsole/vconsole-setup.c b/src/vconsole/vconsole-setup.c
index b28e2853e10b16ff7ebd313767696a85c9faae84..45915ef853bfb54a5f090c070f6d224823132229 100644 (file)
--- a/src/vconsole/vconsole-setup.c
+++ b/src/vconsole/vconsole-setup.c
@@ -430,7 +430,7 @@ int main(int argc, char **argv) {
         unsigned idx = 0;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/veritysetup/veritysetup.c b/src/veritysetup/veritysetup.c
index 9ecfbc5217f901c141bcb8dcf41fc2414cca1feb..2b54065437fe49f1375cfcc6a8811feed04ee7ea 100644 (file)
--- a/src/veritysetup/veritysetup.c
+++ b/src/veritysetup/veritysetup.c
@@ -136,7 +136,7 @@ static int run(int argc, char *argv[]) {
         if (argc < 3)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "This program requires at least two arguments.");
 
-        log_setup_service();
+        log_setup();
 
         umask(0022);
 

diff --git a/src/volatile-root/volatile-root.c b/src/volatile-root/volatile-root.c
index ee3532cc02a0a0bfd57927615d106c64dfd05207..242ef81ecf765b657198858a353c3021ea0796c2 100644 (file)
--- a/src/volatile-root/volatile-root.c
+++ b/src/volatile-root/volatile-root.c
@@ -119,7 +119,7 @@ static int run(int argc, char *argv[]) {
         dev_t devt;
         int r;
 
-        log_setup_service();
+        log_setup();
 
         if (argc > 3)
                 return log_error_errno(SYNTHETIC_ERRNO(EINVAL),