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

man: add FILES section to systemd-journald.service(8)

This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2013-07-15 22:20:06 -04:00
parent 31a7eb86f1
commit 65cd79f7f5
2 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
man/systemd-journald.service.xml
View File

@ -191,6 +191,40 @@
directory.</para>
</refsect1>
<refsect1>
<title>Files</title>
<variablelist>
<varlistentry>
<term><filename>/etc/systemd/journald.conf</filename></term>
<listitem><para>Configure
<command>systemd-journald</command>
behaviour. See
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.
</para></listitem>
</varlistentry>
<varlistentry>
<term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal</filename></term>
<term><filename>/var/log/journal/<replaceable>machine-id</replaceable>/*.journal~</filename></term>
<listitem><para><command>systemd-journald</command>
writes entries to files in
<filename>/var/log/journal/<replaceable>machine-id</replaceable>/</filename>
with the <literal>.journal</literal>
suffix. If the daemon is stopped
uncleanly, or if the files are found
to be corrupted, they are renamed
using the <literal>.journal~</literal>
suffix, and
<command>systemd-journald</command>
starts writing to a new file.
</para></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>See Also</title>
<para>
@ -199,7 +233,8 @@
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
<citerefentry><refentrytitle>systemd.journal-fields</refentrytitle><manvolnum>7</manvolnum></citerefentry>,
<citerefentry><refentrytitle>sd-journal</refentrytitle><manvolnum>3</manvolnum></citerefentry>,
<citerefentry><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>
<citerefentry><refentrytitle>setfacl</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
<command>pydoc systemd.journal</command>.
</para>
</refsect1>

4
src/core/manager.c
View File

@ -301,8 +301,6 @@ static int manager_watch_idle_pipe(Manager *m) {
}
log_debug("Set up idle_pipe watch.");
log_debug("m->epoll_fd=%d m->idle_pipe_watch.fd=%d",
m->epoll_fd, m->idle_pipe_watch.fd);
return 0;
@ -317,8 +315,6 @@ static void manager_unwatch_idle_pipe(Manager *m) {
if (m->idle_pipe_watch.type != WATCH_IDLE_PIPE)
return;
log_debug("m->epoll_fd=%d m->idle_pipe_watch.fd=%d",
m->epoll_fd, m->idle_pipe_watch.fd);
assert_se(epoll_ctl(m->epoll_fd, EPOLL_CTL_DEL, m->idle_pipe_watch.fd, NULL) >= 0);
watch_init(&m->idle_pipe_watch);