journal: fix iteration through journal if one file is corrupt

diff --git a/TODO b/TODO
index 56798a5882d8ce6ba21f4c8261a0b5b6961a3f0a..b8369c364cb4ee7d3b592bbde0f0e55c776012f2 100644 (file)
--- a/TODO
+++ b/TODO
@@ -22,6 +22,8 @@ Bugfixes:
 
 Features:
 
+* journald: _BOOT_ID triggers too many collisions.
+
 * journald: we currently rotate only after MaxUse+MaxFilesize has been reached.
 
 * reexec journald across initrd transition

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 9c6cbaac5108856aacdc05188d9e256e855355d2..75884594a19346819e683748d2fb65e6e6f2288d 100644 (file)
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -670,9 +670,10 @@ static int real_journal_next(sd_journal *j, direction_t direction) {
                 bool found;
 
                 r = next_beyond_location(j, f, direction, &o, &p);
-                if (r < 0)
-                        return r;
-                else if (r == 0)
+                if (r < 0) {
+                        log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r));
+                        continue;
+                } else if (r == 0)
                         continue;
 
                 if (!new_current)