shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-28 20:25:38 +03:00
Code

journal: send journald logs to kmsg again

Browse Source 
This was broken by commit bc694c06e6.
This commit is contained in:
Franck Bui 2020-12-04 09:48:52 +01:00 committed by Lennart Poettering
parent 089cd8b34b
commit b3d6eb0165
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/journal/journald.c
View File

@ -15,6 +15,7 @@
int main(int argc, char *argv[]) {
const char *namespace;
LogTarget log_target;
Server server;
int r;
@ -25,8 +26,13 @@ int main(int argc, char *argv[]) {
namespace = argc > 1 ? empty_to_null(argv[1]) : NULL;
log_set_prohibit_ipc(true);
log_set_target(LOG_TARGET_AUTO);
/* So here's the deal: journald can't be considered as regular daemon when it comes to
* logging hence LOG_TARGET_AUTO won't do the right thing for it. Hence explicitly log to
* the console if we're started from a console or to kmsg otherwise. */
log_target = isatty(STDERR_FILENO) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_KMSG;
log_set_prohibit_ipc(true); /* better safe than sorry */
log_set_target(log_target);
log_set_facility(LOG_SYSLOG);
log_parse_environment();
log_open();