summaryrefslogtreecommitdiffstats
path: root/src/journal-remote
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-25 14:09:09 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-04-25 17:06:43 +0200
commitaa976d87889ae22b7347787a1ebd03a31dcc0a9e (patch)
tree08c1a7e8bff36f1def213ac176cf9f725c5c7f1f /src/journal-remote
parentmkosi: Make sure systemd-resolved is started on boot (diff)
downloadsystemd-aa976d87889ae22b7347787a1ebd03a31dcc0a9e.tar.xz
systemd-aa976d87889ae22b7347787a1ebd03a31dcc0a9e.zip
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.
Diffstat (limited to 'src/journal-remote')
-rw-r--r--src/journal-remote/journal-remote-main.c3
-rw-r--r--src/journal-remote/journal-upload.c3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/journal-remote/journal-remote-main.c b/src/journal-remote/journal-remote-main.c
index 545a1c6240..64f8125df3 100644
--- 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 657e574d2d..f6b9351907 100644
--- 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);