diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-01-24 17:33:07 +0100 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2018-05-30 07:50:15 +0200 |
| commit | 50cac1201976fbf64285378b7d2422c758cef254 (patch) | |
| tree | 20e71b09ca64730eaaacce4b1082dfc5eed19d98 /src/basic/log.c | |
| parent | d776c8ca879216a12abaa39bc17721b071045cd6 (diff) | |
log: make log_set_upgrade_syslog_to_journal() take effect immediately
This doesn't matter much, and we don't rely on it, but I think it's much
nicer if we log_set_target() and log_set_upgrade_syslog_to_journal() can
be called in either order and have the same effect.
Diffstat (limited to 'src/basic/log.c')
| -rw-r--r-- | src/basic/log.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index d9890e835..b01ebaacd 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -1337,6 +1337,14 @@ int log_syntax_invalid_utf8_internal( #if 0 /// UNNEEDED by elogind void log_set_upgrade_syslog_to_journal(bool b) { upgrade_syslog_to_journal = b; + + /* Make the change effective immediately */ + if (b) { + if (log_target == LOG_TARGET_SYSLOG) + log_target = LOG_TARGET_JOURNAL; + else if (log_target == LOG_TARGET_SYSLOG_OR_KMSG) + log_target = LOG_TARGET_JOURNAL_OR_KMSG; + } } void log_set_always_reopen_console(bool b) { |