summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-11-02 23:13:01 +0100
committerLennart Poettering <lennart@poettering.net>2015-11-03 00:02:00 +0100
commit4f52b822b05c373f40fea1a41ae3ade5d5ff558e (patch)
tree25aea522d38673562462b7295a0d13800ee15eca /src/journal
parentcfb571f30fd415304b2f674f1615dc861058c347 (diff)
journalctl: continue operation, even if we run into an invalid file
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/journalctl.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index a35783e3ff..30ae6e39c3 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -1729,15 +1729,12 @@ static int access_check(sd_journal *j) {
SET_FOREACH(code, j->errors, it) {
int err;
- err = -PTR_TO_INT(code);
- assert(err > 0);
+ err = abs(PTR_TO_INT(code));
if (err == EACCES)
continue;
- log_warning_errno(err, "Error was encountered while opening journal files: %m");
- if (r == 0)
- r = -err;
+ log_warning_errno(err, "An error was encountered while opening journal files, ignoring: %m");
}
return r;