diff options
| author | Filipe Brandenburger <filbranden@gmail.com> | 2020-06-17 12:17:54 -0700 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2020-06-24 16:49:26 +0200 |
| commit | 41d1f469cf10f5f3e9cb4f4853ace9b0cfe5beae (patch) | |
| tree | 5a8bbe67cfafb46b99daf93f219699f93b968a95 /src/journal | |
| parent | a1ba8c5b71164665ccb53c9cec384e5eef7d3689 (diff) | |
| download | systemd-41d1f469cf10f5f3e9cb4f4853ace9b0cfe5beae.tar.gz | |
log: introduce log_parse_environment_cli() and log_setup_cli()
Presently, CLI utilities such as systemctl will check whether they have a tty
attached or not to decide whether to parse /proc/cmdline or EFI variable
SystemdOptions looking for systemd.log_* entries.
But this check will be misleading if these tools are being launched by a
daemon, such as a monitoring daemon or automation service that runs in
background.
Make log handling of CLI tools uniform by never checking /proc/cmdline or EFI
variables to determine the logging level.
Furthermore, introduce a new log_setup_cli() shortcut to set up common options
used by most command-line utilities.
Diffstat (limited to 'src/journal')
| -rw-r--r-- | src/journal/cat.c | 4 | ||||
| -rw-r--r-- | src/journal/journalctl.c | 4 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/journal/cat.c b/src/journal/cat.c index 500b674505..2faaa2e284 100644 --- a/src/journal/cat.c +++ b/src/journal/cat.c @@ -129,9 +129,7 @@ static int run(int argc, char *argv[]) { _cleanup_close_ int outfd = -1, errfd = -1, saved_stderr = -1; int r; - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup_cli(); r = parse_argv(argc, argv); if (r <= 0) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 859f4bbd44..6ba65a1071 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2115,9 +2115,7 @@ int main(int argc, char *argv[]) { int n_shown = 0, r, poll_fd = -1; setlocale(LC_ALL, ""); - log_show_color(true); - log_parse_environment(); - log_open(); + log_setup_cli(); /* 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. */ |