]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journalctl: continue operation, even if we run into an invalid file
authorLennart Poettering <lennart@poettering.net>
Mon, 2 Nov 2015 22:13:01 +0000 (23:13 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 2 Nov 2015 23:02:00 +0000 (00:02 +0100)
src/journal/journalctl.c

index a35783e3ff2e8bfa1b67c38b69ef0fe017dd5f19..30ae6e39c3221aa423ffe7d35c76889f4bc4c327 100644 (file)
@@ -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;