summaryrefslogtreecommitdiff
path: root/src/journal/journald.c
diff options
context:
space:
mode:
authorKay Sievers <kay@vrfy.org>2013-03-23 21:02:59 +0100
committerKay Sievers <kay@vrfy.org>2013-03-23 21:09:37 +0100
commit7964dfca1b6c4b37d069b3713f9f1b11219c3474 (patch)
treeed985274b12e3147fcf441f95c337a2024b8b964 /src/journal/journald.c
parent7eb1dfcfc4c9c02e772e042c39f801c6fa8ad1b4 (diff)
journald: remove unconditional log_*() use in the main loop
Setting MaxRetentionSec= caused the kernel log to overflow and the journal daemon to enter an endless loop. Logging from the journald main loop gets directed to /dev/kmsg, which wakes up journald again. We skip the import of this message by checking for our own PID, but this still causes the main loop to never go to sleep again because we never stopped logging from there.
Diffstat (limited to 'src/journal/journald.c')
-rw-r--r--src/journal/journald.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index d6b9be5974..5fb10b1d3f 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -88,7 +88,6 @@ int main(int argc, char *argv[]) {
/* Calculate when to rotate the next time */
t = (int) ((server.oldest_file_usec + server.max_retention_usec - n + USEC_PER_MSEC - 1) / USEC_PER_MSEC);
- log_info("Sleeping for %i ms", t);
}
#ifdef HAVE_GCRYPT