]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journalctl: make sure 'journalctl -f -t unmatched' blocks 958/head
authorStef Walter <stefw@redhat.com>
Fri, 14 Aug 2015 14:38:41 +0000 (16:38 +0200)
committerStef Walter <stefw@redhat.com>
Mon, 17 Aug 2015 07:51:51 +0000 (09:51 +0200)
Previously the following command:

$ journalctl -f -t unmatchedtag12345

... would block when called with criteria that did not match any
journal lines. Once log lines appeared that matched the criteria
they were displayed.

Commit 02ab86c732576a71179ce12e97d44c289833236d broke this
behavior and the journal was not followed, but the command
exits with '-- No entries --' displayed.

This commit fixes the issue.

More information downstream:

https://bugzilla.redhat.com/show_bug.cgi?id=1253649

src/journal/journalctl.c

index fe83edd2b3da96e3c45c16f6474eaae968e350ca..ce2dd9da26cabd233333387b677c6b2e990788d1 100644 (file)
@@ -2066,8 +2066,12 @@ int main(int argc, char *argv[]) {
                 goto finish;
         }
         if (r == 0) {
-                printf("-- No entries --\n");
-                goto finish;
+                if (arg_follow)
+                        need_seek = true;
+                else {
+                        printf("-- No entries --\n");
+                        goto finish;
+                }
         }
 
         if (!arg_follow)