summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStef Walter <stefw@redhat.com>2015-08-14 16:38:41 +0200
committerStef Walter <stefw@redhat.com>2015-08-17 09:51:51 +0200
commitc51e1a96359b3f4d374345593b11273df2132b93 (patch)
tree9b61b312344a268a8104c4bb6ebfbb6d1be01e81
parent0d4605ec3c9c1392bb5f0abc590b1d855df5eebb (diff)
journalctl: make sure 'journalctl -f -t unmatched' blocks
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
-rw-r--r--src/journal/journalctl.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index fe83edd2b3..ce2dd9da26 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -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)