diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-04-11 15:27:55 +0200 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-04-17 09:15:23 +0200 |
| commit | cd34b3c6670df8a3fd49179131fe762b2dd86b01 (patch) | |
| tree | 60dc6d2658200e41ae0c0e9a6510f78e6d3d19ee /src/journal/journal-internal.h | |
| parent | 003ac9d0318ce28e0b29af5440c9f28f884da04c (diff) | |
journal: add one more level on top with AND
When using "-p" and "-b" in combination with "-u", the output is not
what you would expect. The reason is the sd_journal_add_disjunction()
call in add_matches_for_unit() and add_matches_for_user_unit(), which
adds two ORs without taking the other conditions to every OR.
Adding another level on top with AND and sd_journal_add_conjunction()
solves the problem.
Output before:
$ journalctl -o short-monotonic -ab -p 0 -u sshd.service
-- Reboot --
[ 3.216305] lenovo systemd[1]: Starting OpenSSH server daemon...
-- Reboot --
[ 3.168666] lenovo systemd[1]: Starting OpenSSH server daemon...
[ 3.169639] lenovo systemd[1]: Started OpenSSH server daemon.
[36285.635389] lenovo systemd[1]: Stopped OpenSSH server daemon.
-- Reboot --
[ 10.838657] lenovo systemd[1]: Starting OpenSSH server daemon...
[ 10.913698] lenovo systemd[1]: Started OpenSSH server daemon.
[ 6881.035183] lenovo systemd[1]: Stopped OpenSSH server daemon.
-- Reboot --
[ 6.636228] lenovo systemd[1]: Starting OpenSSH server daemon...
[ 6.662573] lenovo systemd[1]: Started OpenSSH server daemon.
[ 6.681148] lenovo sshd[397]: Server listening on 0.0.0.0 port 22.
[ 6.681379] lenovo sshd[397]: Server listening on :: port 22.
As we see, the output is from _every_ boot and priority 0 is not taken
into account.
Output after patch:
$ journalctl -o short-monotonic -ab -p 0 -u sshd.service
-- Logs begin at Sun 2013-02-24 20:54:44 CET, end at Tue 2013-03-19 14:58:21 CET. --
Increasing the priority:
$ journalctl -o short-monotonic -ab -p 6 -u sshd.service
-- Logs begin at Sun 2013-02-24 20:54:44 CET, end at Tue 2013-03-19 14:59:12 CET. --
[ 6.636228] lenovo systemd[1]: Starting OpenSSH server daemon...
[ 6.662573] lenovo systemd[1]: Started OpenSSH server daemon.
[ 6.681148] lenovo sshd[397]: Server listening on 0.0.0.0 port 22.
[ 6.681379] lenovo sshd[397]: Server listening on :: port 22.
Diffstat (limited to 'src/journal/journal-internal.h')
| -rw-r--r-- | src/journal/journal-internal.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/journal/journal-internal.h b/src/journal/journal-internal.h index ff8b34a951..eea56e4713 100644 --- a/src/journal/journal-internal.h +++ b/src/journal/journal-internal.h @@ -113,7 +113,7 @@ struct sd_journal { int inotify_fd; - Match *level0, *level1; + Match *level0, *level1, *level2; unsigned current_invalidate_counter, last_invalidate_counter; |