[systemd-commits] man/systemd-journald.service.xml src/core

[Zbigniew Jędrzejewski-Szmek]

 man/systemd-journald.service.xml |   37 ++++++++++++++++++++++++++++++++++++-
 src/core/manager.c               |    4 ----
 2 files changed, 36 insertions(+), 5 deletions(-)

New commits:
commit 65cd79f7f574532e5f91d581aaff923c29655bbd
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Mon Jul 15 22:20:06 2013 -0400

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

diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml
index d751f9b..45091c6 100644
--- a/man/systemd-journald.service.xml
+++ b/man/systemd-journald.service.xml
@@ -192,6 +192,40 @@
         </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>
                         <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
@@ -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>
 
diff --git a/src/core/manager.c b/src/core/manager.c
index ad1a8d6..6c082c9 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -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);