|
 |
2d8d482 |
From c5af9aa2ccab078cf6f5bf68b88a3defa2f768f8 Mon Sep 17 00:00:00 2001
|
|
|
2d8d482 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
2d8d482 |
Date: Sat, 13 May 2017 16:40:09 -0400
|
|
|
2d8d482 |
Subject: [PATCH] shared/logs-show: avoid printing "(null)" when timestamp is
|
|
|
2d8d482 |
not specified
|
|
|
2d8d482 |
|
|
|
2d8d482 |
$ perl -e 'print("MESSAGE\n", pack("q<", 1), "A\n\nMESSAGE=test2\n")' > message.bin
|
|
|
2d8d482 |
$ systemd-journal-remote -o /tmp/out.journal message.bin
|
|
|
2d8d482 |
$ journalctl -o export --file /tmp/out.journal
|
|
|
2d8d482 |
__CURSOR=s=b16c464c2db44384b29e75a564d8388e;i=1;b=6b0be47627bd4932913dc126012c21c0;m=0;t=0;x=b04263a253e357a
|
|
|
2d8d482 |
__REALTIME_TIMESTAMP=0
|
|
|
2d8d482 |
__MONOTONIC_TIMESTAMP=0
|
|
|
2d8d482 |
_BOOT_ID=6b0be47627bd4932913dc126012c21c0
|
|
|
2d8d482 |
MESSAGE=A
|
|
|
2d8d482 |
|
|
|
2d8d482 |
$ journalctl -o verbose --file /tmp/out.journal
|
|
|
2d8d482 |
(null) [s=b16c464c2db44384b29e75a564d8388e;i=1;b=6b0be47627bd4932913dc126012c21c0;m=0;t=0;x=b04263a253e357a]
|
|
|
2d8d482 |
MESSAGE=A
|
|
|
2d8d482 |
|
|
|
2d8d482 |
This is changed to
|
|
|
2d8d482 |
$ build/journalctl -o verbose --file /tmp/out.journal
|
|
|
2d8d482 |
(no timestamp) [s=b16c464c2db44384b29e75a564d8388e;i=1;b=6b0be47627bd4932913dc126012c21c0;m=0;t=0;x=b04263a253e357a]
|
|
|
2d8d482 |
MESSAGE=A
|
|
|
2d8d482 |
|
|
|
2d8d482 |
We should deal gracefully with unexpected input.
|
|
|
2d8d482 |
|
|
|
2d8d482 |
(cherry picked from commit 8924973ae2e1f0a0c131dcec0578669dc26e5e26)
|
|
|
2d8d482 |
---
|
|
|
2d8d482 |
src/shared/logs-show.c | 7 ++++---
|
|
|
2d8d482 |
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
|
2d8d482 |
|
|
|
2d8d482 |
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
|
|
|
2d8d482 |
index 72c43e80cb..b4c72215c4 100644
|
|
|
2d8d482 |
--- a/src/shared/logs-show.c
|
|
|
2d8d482 |
+++ b/src/shared/logs-show.c
|
|
|
2d8d482 |
@@ -473,6 +473,7 @@ static int output_verbose(
|
|
|
2d8d482 |
_cleanup_free_ char *cursor = NULL;
|
|
|
2d8d482 |
uint64_t realtime = 0;
|
|
|
2d8d482 |
char ts[FORMAT_TIMESTAMP_MAX + 7];
|
|
|
2d8d482 |
+ const char *timestamp;
|
|
|
2d8d482 |
int r;
|
|
|
2d8d482 |
|
|
|
2d8d482 |
assert(f);
|
|
|
2d8d482 |
@@ -508,10 +509,10 @@ static int output_verbose(
|
|
|
2d8d482 |
if (r < 0)
|
|
|
2d8d482 |
return log_error_errno(r, "Failed to get cursor: %m");
|
|
|
2d8d482 |
|
|
|
2d8d482 |
+ timestamp = flags & OUTPUT_UTC ? format_timestamp_us_utc(ts, sizeof ts, realtime)
|
|
|
2d8d482 |
+ : format_timestamp_us(ts, sizeof ts, realtime);
|
|
|
2d8d482 |
fprintf(f, "%s [%s]\n",
|
|
|
2d8d482 |
- flags & OUTPUT_UTC ?
|
|
|
2d8d482 |
- format_timestamp_us_utc(ts, sizeof(ts), realtime) :
|
|
|
2d8d482 |
- format_timestamp_us(ts, sizeof(ts), realtime),
|
|
|
2d8d482 |
+ timestamp ?: "(no timestamp)",
|
|
|
2d8d482 |
cursor);
|
|
|
2d8d482 |
|
|
|
2d8d482 |
JOURNAL_FOREACH_DATA_RETVAL(j, data, length, r) {
|