加入 Gitee
与超过 1200万 开发者一起发现、参与优秀开源项目,私有仓库也完全免费 :)
免费加入
文件
该仓库未声明开源许可证文件(LICENSE),使用请关注具体项目描述及其代码上游依赖。
克隆/下载
backport-journactl-show-info-about-journal-range-only-at-debu.patch 2.03 KB
一键复制 编辑 原始数据 按行查看 历史
From cc9ef67919c33b253bed86db415f5970e96440d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
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=UTF-8
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)
Conflict:NA
Reference:https://github.com/systemd/systemd/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 3eac97510d..decdf14145 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -2598,7 +2598,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.33.0
马建仓 AI 助手
尝试更多
代码解读
代码找茬
代码优化