diff options
| author | Lennart Poettering <lennart@poettering.net> | 2012-01-12 05:09:06 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2012-01-12 05:09:06 +0100 |
| commit | 4cfa2c999dea269ddc646bfeba6c7f1021a73843 (patch) | |
| tree | f30287296cc7a7d2626e6079ad6f272f38fe79ec /src/manager.c | |
| parent | ead51eb4ed55981f290e40a871ffbca6480c4cd3 (diff) | |
core: switch all log targets to go directly to the journal, instead via syslog
Diffstat (limited to 'src/manager.c')
| -rw-r--r-- | src/manager.c | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/manager.c b/src/manager.c index 54df7ebe5f..a549209ca6 100644 --- a/src/manager.c +++ b/src/manager.c @@ -195,6 +195,7 @@ static int manager_setup_signals(Manager *m) { SIGRTMIN+21, /* systemd: disable status messages */ SIGRTMIN+22, /* systemd: set log level to LOG_DEBUG */ SIGRTMIN+23, /* systemd: set log level to LOG_INFO */ + 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 */ @@ -2293,6 +2294,11 @@ static int manager_process_signal_fd(Manager *m) { log_notice("Setting log level to info."); break; + case 26: + log_set_target(LOG_TARGET_JOURNAL_OR_KMSG); + log_notice("Setting log target to journal-or-kmsg."); + break; + case 27: log_set_target(LOG_TARGET_CONSOLE); log_notice("Setting log target to console."); @@ -3121,7 +3127,7 @@ int manager_set_default_controllers(Manager *m, char **controllers) { return 0; } -void manager_recheck_syslog(Manager *m) { +void manager_recheck_journal(Manager *m) { Unit *u; assert(m); @@ -3131,13 +3137,13 @@ void manager_recheck_syslog(Manager *m) { u = manager_get_unit(m, SPECIAL_JOURNALD_SOCKET); if (u && SOCKET(u)->state != SOCKET_RUNNING) { - log_close_syslog(); + log_close_journal(); return; } u = manager_get_unit(m, SPECIAL_JOURNALD_SERVICE); if (u && SERVICE(u)->state != SERVICE_RUNNING) { - log_close_syslog(); + log_close_journal(); return; } |