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

core: switch all log targets to go directly to the journal, instead via syslog

This commit is contained in:
Lennart Poettering 2012-01-12 05:09:06 +01:00
parent ead51eb4ed
commit 4cfa2c999d
24 changed files with 47 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
man/systemd.xml
View File

@ -209,8 +209,10 @@
<listitem><para>Set log
target. Argument must be one of
<option>console</option>,
<option>journal</option>,
<option>syslog</option>,
<option>kmsg</option>,
<option>journal-or-kmsg</option>,
<option>syslog-or-kmsg</option>,
<option>null</option>.</para></listitem>
</varlistentry>
@ -266,13 +268,15 @@
<option>inherit</option>,
<option>null</option>,
<option>tty</option>,
<option>journal</option>,
<option>journal+console</option>,
<option>syslog</option>,
<option>syslog+console</option>,
<option>kmsg</option>,
<option>kmsg+console</option>. If the
argument is omitted
<option>--default-standard-output=</option>
defaults to <option>syslog</option>
defaults to <option>journal</option>
and
<option>--default-standard-error=</option>
to
@ -823,19 +827,24 @@
</varlistentry>
<varlistentry>
<term>SIGRTMIN+26</term>
<term>SIGRTMIN+27</term>
<term>SIGRTMIN+28</term>
<term>SIGRTMIN+29</term>
<listitem><para>Sets the log level to
<literal>console</literal>
(resp. <literal>kmsg</literal> on
<literal>journal-or-kmsg</literal>
(resp. <literal>console</literal> on
<literal>SIGRTMIN+27</literal>;
resp. <literal>kmsg</literal> on
<literal>SIGRTMIN+28</literal>;
resp. <literal>syslog-or-kmsg</literal>
on <literal>SIGRTMIN+29</literal>), as
controlled via
<varname>systemd.log_target=console</varname>
(resp. <varname>systemd.log_target=kmsg</varname>
<varname>systemd.log_target=journal-or-kmsg</varname>
(resp. <varname>systemd.log_target=console</varname>
on <literal>SIGRTMIN+27</literal>;
resp. <varname>systemd.log_target=kmsg</varname>
on <literal>SIGRTMIN+28</literal>;
resp
<varname>systemd.log_target=syslog-or-kmsg</varname>
@ -1078,19 +1087,6 @@
</varlistentry>
<varlistentry>
<term><filename>/run/systemd/stdout-syslog-bridge</filename></term>
<listitem><para>Used internally by the
<filename>systemd-stdout-syslog-bridge.service</filename>
unit to connect STDOUT and/or STDERR
of spawned processes to
<citerefentry><refentrytitle>syslog</refentrytitle><manvolnum>3</manvolnum></citerefentry>
or the kernel log buffer. This is an
AF_UNIX stream
socket.</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/run/systemd/shutdownd</filename></term>

2
src/bridge.c
View File

@ -147,7 +147,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_JOURNAL_OR_KMSG);
log_parse_environment();
log_open();

2
src/cgroups-agent.c
View File

@ -39,7 +39,7 @@ int main(int argc, char *argv[]) {
goto finish;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/cryptsetup/cryptsetup-generator.c
View File

@ -245,7 +245,7 @@ int main(int argc, char *argv[]) {
if (argc > 1)
arg_dest = argv[1];
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/getty-generator.c
View File

@ -103,7 +103,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/initctl.c
View File

@ -388,7 +388,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/login/user-sessions.c
View File

@ -35,7 +35,7 @@ int main(int argc, char*argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

6
src/main.c
View File

@ -343,7 +343,7 @@ static int parse_proc_cmdline_word(const char *word) {
#ifdef HAVE_SYSV_COMPAT
"systemd.sysv_console=0|1 Connect output of SysV scripts to console\n"
#endif
"systemd.log_target=console|kmsg|syslog|syslog-or-kmsg|null\n"
"systemd.log_target=console|kmsg|journal|journal-or-kmsg|syslog|syslog-or-kmsg|null\n"
" Log target\n"
"systemd.log_level=LEVEL Log level\n"
"systemd.log_color=0|1 Highlight important log messages\n"
@ -993,7 +993,7 @@ static int help(void) {
#ifdef HAVE_SYSV_COMPAT
" --sysv-console[=0|1] Connect output of SysV scripts to console\n"
#endif
" --log-target=TARGET Set log target (console, syslog, kmsg, syslog-or-kmsg, null)\n"
" --log-target=TARGET Set log target (console, journal, syslog, kmsg, journal-or-kmsg, syslog-or-kmsg, null)\n"
" --log-level=LEVEL Set log level (debug, info, notice, warning, err, crit, alert, emerg)\n"
" --log-color[=0|1] Highlight important log messages\n"
" --log-location[=0|1] Include code location in log messages\n"
@ -1177,7 +1177,7 @@ int main(int argc, char *argv[]) {
if (getpid() == 1) {
arg_running_as = MANAGER_SYSTEM;
log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(detect_container(NULL) > 0 ? LOG_TARGET_CONSOLE : LOG_TARGET_JOURNAL_OR_KMSG);
if (!is_reexec)
if (selinux_setup(&loaded_policy) < 0)

12
src/manager.c
View File

@ -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;
}

2
src/manager.h
View File

@ -289,7 +289,7 @@ void manager_check_finished(Manager *m);
void manager_run_generators(Manager *m);
void manager_undo_generators(Manager *m);
void manager_recheck_syslog(Manager *m);
void manager_recheck_journal(Manager *m);
void manager_set_show_status(Manager *m, bool b);
bool manager_get_show_status(Manager *m);

2
src/modules-load.c
View File

@ -42,7 +42,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/quotacheck.c
View File

@ -87,7 +87,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/random-seed.c
View File

@ -43,7 +43,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/rc-local-generator.c
View File

@ -88,7 +88,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/readahead/readahead-collect.c
View File

@ -654,7 +654,7 @@ int main(int argc, char *argv[]) {
int r;
const char *root;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/readahead/readahead-replay.c
View File

@ -338,7 +338,7 @@ int main(int argc, char*argv[]) {
int r;
const char *root;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/remount-api-vfs.c
View File

@ -48,7 +48,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/reply-password.c
View File

@ -64,7 +64,7 @@ int main(int argc, char *argv[]) {
char packet[LINE_MAX];
size_t length;
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/shutdownd.c
View File

@ -189,7 +189,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
src/system.conf
View File

@ -9,7 +9,7 @@
[Manager]
#LogLevel=info
#LogTarget=syslog-or-kmsg
#LogTarget=journal-or-kmsg
#LogColor=yes
#LogLocation=no
#DumpCore=yes

2
src/unit.c
View File

@ -1338,7 +1338,7 @@ void unit_notify(Unit *u, UnitActiveState os, UnitActiveState ns, bool reload_su
}
}
manager_recheck_syslog(u->meta.manager);
manager_recheck_journal(u->meta.manager);
/* Maybe we finished startup and are now ready for being
* stopped because unneeded? */

2
src/update-utmp.c
View File

@ -369,7 +369,7 @@ int main(int argc, char *argv[]) {
return EXIT_FAILURE;
}
log_set_target(LOG_TARGET_SYSLOG_OR_KMSG);
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();

2
units/fsck-root.service.in
View File

@ -18,6 +18,6 @@ ConditionPathExists=!/run/initramfs/root-fsck
Type=oneshot
RemainAfterExit=no
ExecStart=@rootlibexecdir@/systemd-fsck
StandardOutput=syslog+console
StandardOutput=journal+console
FsckPassNo=1
TimeoutSec=0

2
units/fsck@.service.in
View File

@ -16,5 +16,5 @@ Before=shutdown.target
Type=oneshot
RemainAfterExit=no
ExecStart=@rootlibexecdir@/systemd-fsck %f
StandardOutput=syslog+console
StandardOutput=journal+console
TimeoutSec=0