summaryrefslogtreecommitdiff
path: root/src/shared
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-26 09:52:55 -0400
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2016-04-26 09:52:55 -0400
commita109d2e204ae9561c4a7f7982448a6ca0d318fb3 (patch)
treee5748844e740c3e7452040154fd3035b304eaee8 /src/shared
parent25eb92e14f2bcc7743f64230d52c75e9f864d5f5 (diff)
parent28c75e250155a6895a28e181aa7b84330864a28f (diff)
Merge pull request #3124 from poettering/small-journal-fixes
Diffstat (limited to 'src/shared')
-rw-r--r--src/shared/logs-show.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index cd3d53669c..9351b85eed 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -287,7 +287,10 @@ static int output_short(
if (r < 0)
return r;
}
-
+ if (r == -EBADMSG) {
+ log_debug_errno(r, "Skipping message we can't read: %m");
+ return 0;
+ }
if (r < 0)
return log_error_errno(r, "Failed to get journal fields: %m");