From: Luca Boccassi <bluca@debian.org>
Date: Wed, 30 Aug 2023 17:56:07 +0000 (+0100)
Subject: busctl: do not print start/stop monitoring messages with --quiet/--json
X-Git-Tag: v255-rc1~616
X-Git-Url: http://git-history.diyao.me/?a=commitdiff_plain;h=a699b1e7a9368c6e1a800a837696899480f0fb17;p=systemd%2F.git

busctl: do not print start/stop monitoring messages with --quiet/--json
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index f85db5fe14..d13d5bef6d 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1308,7 +1308,8 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
         if (r < 0)
                 return log_error_errno(r, "Failed to get unique name: %m");
 
-        log_info("Monitoring bus message stream.");
+        if (!arg_quiet && arg_json_format_flags == JSON_FORMAT_OFF)
+                log_info("Monitoring bus message stream.");
 
         for (;;) {
                 _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL;
@@ -1339,7 +1340,8 @@ static int monitor(int argc, char **argv, int (*dump)(sd_bus_message *m, FILE *f
                         fflush(stdout);
 
                         if (sd_bus_message_is_signal(m, "org.freedesktop.DBus.Local", "Disconnected") > 0) {
-                                log_info("Connection terminated, exiting.");
+                                if (!arg_quiet && arg_json_format_flags == JSON_FORMAT_OFF)
+                                        log_info("Connection terminated, exiting.");
                                 return 0;
                         }