picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

journal: fix iteration through journal if one file is corrupt

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: Features:
* journald: _BOOT_ID triggers too many collisions.
* journald: we currently rotate only after MaxUse+MaxFilesize has been reached. * journald: we currently rotate only after MaxUse+MaxFilesize has been reached.
* reexec journald across initrd transition * 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; bool found;
r = next_beyond_location(j, f, direction, &o, &p); r = next_beyond_location(j, f, direction, &o, &p);
if (r < 0) if (r < 0) {
return r; log_debug("Can't iterate through %s, ignoring: %s", f->path, strerror(-r));
else if (r == 0) continue;
} else if (r == 0)
continue; continue;
if (!new_current) if (!new_current)