diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-01-24 18:01:01 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-01-24 18:22:56 +0100 |
| commit | 6c347d5024e7451336d0c5d0f7eaf90ae11d9dc9 (patch) | |
| tree | 573979425305a2f337aff8f96e91eb3c42228641 /src/basic/log.c | |
| parent | 7a3be263d2ac9ecb17072c956789c4882c230f1e (diff) | |
| download | systemd-6c347d5024e7451336d0c5d0f7eaf90ae11d9dc9.tar.gz | |
log: remove LOG_TARGET_SAFE pseudo log target
This removes LOG_TARGET_SAFE. It's made redundant by the new
"prohibit-ipc" logging flag, as it used to have a similar effect: avoid
logging to the journal/syslog, i.e. any local services in order to avoid
deadlocks when we lock from PID 1 or its utility processes (such as
generators).
All previous users of LOG_TARGET_SAFE are switched over to the new
setting. This makes things a bit safer for all, as not even the
SYSTEMD_LOG_TARGET env var can be used to accidentally log to the
journal anymore in these programs.
Diffstat (limited to 'src/basic/log.c')
| -rw-r--r-- | src/basic/log.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/basic/log.c b/src/basic/log.c index ae0ac72b57..2b15ecba84 100644 --- a/src/basic/log.c +++ b/src/basic/log.c @@ -251,7 +251,7 @@ int log_open(void) { return 0; } - if (!IN_SET(log_target, LOG_TARGET_AUTO, LOG_TARGET_SAFE) || + if (log_target != LOG_TARGET_AUTO || getpid_cached() == 1 || isatty(STDERR_FILENO) <= 0) { @@ -279,7 +279,6 @@ int log_open(void) { } if (IN_SET(log_target, LOG_TARGET_AUTO, - LOG_TARGET_SAFE, LOG_TARGET_JOURNAL_OR_KMSG, LOG_TARGET_SYSLOG_OR_KMSG, LOG_TARGET_KMSG)) { @@ -631,7 +630,6 @@ int log_dispatch_internal( if (k <= 0 && IN_SET(log_target, LOG_TARGET_AUTO, - LOG_TARGET_SAFE, LOG_TARGET_SYSLOG_OR_KMSG, LOG_TARGET_JOURNAL_OR_KMSG, LOG_TARGET_KMSG)) { @@ -1223,8 +1221,7 @@ static const char *const log_target_table[_LOG_TARGET_MAX] = { [LOG_TARGET_SYSLOG] = "syslog", [LOG_TARGET_SYSLOG_OR_KMSG] = "syslog-or-kmsg", [LOG_TARGET_AUTO] = "auto", - [LOG_TARGET_SAFE] = "safe", - [LOG_TARGET_NULL] = "null" + [LOG_TARGET_NULL] = "null", }; DEFINE_STRING_TABLE_LOOKUP(log_target, LogTarget); |