picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "log: fix fallbacks to kmsg"

Browse source 
This reverts commit 4a01181e46.

This patch broke LOG_TARGET_AUTO, i.e. automatic selection of STDERR if
it is a TTY with a fallback on the journal and kmsg otherwise.

The general rule should probably be:

log_open() -- open the "best" possible logging channel according to
log_target configuration.

log_dispatch() -- don't open any log channels ever, with the exception
of kmsg since that has no drawbacks. And do this only on true errors of
the better log channel, not just when it wasn't opened.
This commit is contained in:
Lennart Poettering 2013-02-27 14:33:50 +01:00
parent c06bf41404
commit 4e7bc3f339
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/shared/log.c
View file

@ -541,11 +541,11 @@ static int log_dispatch(
k = write_to_journal(level, file, line, func,
object_name, object, buffer);
if (k <= 0) {
if (k < 0 && k != -EAGAIN)
if (k < 0) {
if (k != -EAGAIN)
log_close_journal();
log_open_kmsg();
} else
} else if (k > 0)
r++;
}
@ -554,11 +554,11 @@ static int log_dispatch(
k = write_to_syslog(level, file, line, func,
object_name, object, buffer);
if (k <= 0) {
if (k < 0 && k != -EAGAIN)
if (k < 0) {
if (k != -EAGAIN)
log_close_syslog();
log_open_kmsg();
} else
} else if (k > 0)
r++;
}
@ -571,11 +571,10 @@ static int log_dispatch(
k = write_to_kmsg(level, file, line, func,
object_name, object, buffer);
if (k <= 0) {
if (k < 0 && k != -EAGAIN)
log_close_kmsg();
if (k < 0) {
log_close_kmsg();
log_open_console();
} else
} else if (k > 0)
r++;
}