From a3b7419e504c1c4be2f8b6d8d9ea3bc6bf3aab3e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 14 Dec 2021 22:30:15 +0100 Subject: [PATCH] journactl: show info about journal range only at debug level (#21775) MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The message that the "journal begins … ends …" has been always confusing to users. (Before b91ae210e62 it was "logs begin … end …" which was arguably even more confusing, but really the change in b91ae210e62 didn't substantially change this.) When the range shown is limited (by -e, -f, --since, or other options), it doesn't really matter to the user what the oldest entries are, since they are purposefully limiting the range. In fact, if we are showing the last few entries with -e or -f, knowing that many months the oldest entries have is completely useless. And when such options are *not* used, the first entry generally corresponds to the beginning of the range shown, and the last entry corresponds to the end of that range. So again, it's not particularly useful, except when debugging journalctl or such. Let's just treat it as a debug message. Fixes #21491. (cherry picked from commit a2d7654f99eba250eddf988db262abef96ebbe7a) (cherry picked from commit cc9ef67919c33b253bed86db415f5970e96440d9) --- src/journal/journalctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c index 7b73933c87..b22d7d33b7 100644 --- a/src/journal/journalctl.c +++ b/src/journal/journalctl.c @@ -2595,7 +2595,7 @@ int main(int argc, char *argv[]) { if (!arg_follow) (void) pager_open(arg_pager_flags); - if (!arg_quiet && (arg_lines != 0 || arg_follow)) { + if (!arg_quiet && (arg_lines != 0 || arg_follow) && DEBUG_LOGGING) { usec_t start, end; char start_buf[FORMAT_TIMESTAMP_MAX], end_buf[FORMAT_TIMESTAMP_MAX]; -- 2.25.1