diff options
| author | Lennart Poettering <lennart@poettering.net> | 2014-08-11 20:08:08 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2014-08-11 20:08:08 +0200 |
| commit | c1dc6153c9426d98ddbcd8b5077f397f18ff1da7 (patch) | |
| tree | 6bb0a7586c9f8877666676128ba2ff087118b59f /src/core/manager.c | |
| parent | 79c1afc67f973eaece8f1b7016e016bb33c256a7 (diff) | |
log: never ever log to syslog from PID 1, log to the journal again
We don't support journal-less systems anyway, so let's avoid the
confusion.
Diffstat (limited to 'src/core/manager.c')
| -rw-r--r-- | src/core/manager.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/core/manager.c b/src/core/manager.c index 32c056588a..445461b6b9 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -341,7 +341,7 @@ static int manager_setup_signals(Manager *m) { SIGRTMIN+26, /* systemd: set log target to journal-or-kmsg */ SIGRTMIN+27, /* systemd: set log target to console */ SIGRTMIN+28, /* systemd: set log target to kmsg */ - SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg */ + SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete)*/ -1); assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); @@ -1731,6 +1731,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t break; case 26: + case 29: /* compatibility: used to be mapped to LOG_TARGET_SYSLOG_OR_KMSG */ log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); log_notice("Setting log target to journal-or-kmsg."); break; @@ -1745,11 +1746,6 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t log_notice("Setting log target to kmsg."); break; - case 29: - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); - log_notice("Setting log target to syslog-or-kmsg."); - break; - default: log_warning("Got unhandled signal <%s>.", signal_to_string(sfsi.ssi_signo)); } |