summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--TODO2
-rw-r--r--src/journal/sd-journal.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/TODO b/TODO
index 56798a5882..b8369c364c 100644
--- 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 9c6cbaac51..75884594a1 100644
--- 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)