shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2024-12-23 17:34:00 +03:00
Code

journal: fix iteration through journal if one file is corrupt

Browse Source
This commit is contained in:
Lennart Poettering 2012-07-03 11:58:16 +02:00
parent d197064541
commit e590af2666
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
TODO
View File

@ -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

7
src/journal/sd-journal.c
View File

@ -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)