From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Mon, 28 Apr 2025 00:45:33 +0000 (+0900)
Subject: sd-bus/bus-dump,busctl: downgrade log level in sd_bus_message_dump(), and log in... 
X-Git-Tag: v258-rc1~713^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F37266%2Fhead;p=thirdparty%2Fsystemd.git

sd-bus/bus-dump,busctl: downgrade log level in sd_bus_message_dump(), and log in the caller side
---

diff --git a/src/busctl/busctl.c b/src/busctl/busctl.c
index 62191262f79..f145a89be47 100644
--- a/src/busctl/busctl.c
+++ b/src/busctl/busctl.c
@@ -1191,11 +1191,27 @@ static int introspect(int argc, char **argv, void *userdata) {
 }
 
 static int message_dump(sd_bus_message *m, FILE *f) {
-        return sd_bus_message_dump(m, f, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
+        int r;
+
+        assert(m);
+
+        r = sd_bus_message_dump(m, f, SD_BUS_MESSAGE_DUMP_WITH_HEADER);
+        if (r < 0)
+                return log_error_errno(r, "Failed to dump DBus message: %m");
+
+        return 0;
 }
 
 static int message_pcap(sd_bus_message *m, FILE *f) {
-        return bus_message_pcap_frame(m, arg_snaplen, f);
+        int r;
+
+        assert(m);
+
+        r = bus_message_pcap_frame(m, arg_snaplen, f);
+        if (r < 0)
+                return log_error_errno(r, "Failed to dump DBus message in PCAP format: %m");
+
+        return 0;
 }
 
 static int message_json(sd_bus_message *m, FILE *f) {
diff --git a/src/libsystemd/sd-bus/bus-dump.c b/src/libsystemd/sd-bus/bus-dump.c
index dbc6fcbe87f..07df7d7d34c 100644
--- a/src/libsystemd/sd-bus/bus-dump.c
+++ b/src/libsystemd/sd-bus/bus-dump.c
@@ -118,14 +118,14 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
         r = sd_bus_message_rewind(m, !FLAGS_SET(flags, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY));
         if (r < 0)
-                return log_error_errno(r, "Failed to rewind: %m");
+                return log_debug_errno(r, "Failed to rewind: %m");
 
         if (!FLAGS_SET(flags, SD_BUS_MESSAGE_DUMP_SUBTREE_ONLY)) {
                 _cleanup_free_ char *prefix = NULL;
 
                 prefix = indent(0, flags);
                 if (!prefix)
-                        return log_oom();
+                        return log_oom_debug();
 
                 fprintf(f, "%sMESSAGE \"%s\" {\n", prefix, strempty(m->root_container.signature));
         }
@@ -149,7 +149,7 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
                 r = sd_bus_message_peek_type(m, &type, &contents);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to peek type: %m");
+                        return log_debug_errno(r, "Failed to peek type: %m");
 
                 if (r == 0) {
                         if (level <= 1)
@@ -157,13 +157,13 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
                         r = sd_bus_message_exit_container(m);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to exit container: %m");
+                                return log_debug_errno(r, "Failed to exit container: %m");
 
                         level--;
 
                         prefix = indent(level, flags);
                         if (!prefix)
-                                return log_oom();
+                                return log_oom_debug();
 
                         fprintf(f, "%s};\n", prefix);
                         continue;
@@ -171,12 +171,12 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
                 prefix = indent(level, flags);
                 if (!prefix)
-                        return log_oom();
+                        return log_oom_debug();
 
                 if (bus_type_is_container(type) > 0) {
                         r = sd_bus_message_enter_container(m, type, contents);
                         if (r < 0)
-                                return log_error_errno(r, "Failed to enter container: %m");
+                                return log_debug_errno(r, "Failed to enter container: %m");
 
                         if (type == SD_BUS_TYPE_ARRAY)
                                 fprintf(f, "%sARRAY \"%s\" {\n", prefix, contents);
@@ -194,7 +194,7 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
                 r = sd_bus_message_read_basic(m, type, &basic);
                 if (r < 0)
-                        return log_error_errno(r, "Failed to get basic: %m");
+                        return log_debug_errno(r, "Failed to get basic: %m");
 
                 assert(r > 0);
 
@@ -262,7 +262,7 @@ _public_ int sd_bus_message_dump(sd_bus_message *m, FILE *f, uint64_t flags) {
 
                 prefix = indent(0, flags);
                 if (!prefix)
-                        return log_oom();
+                        return log_oom_debug();
 
                 fprintf(f, "%s};\n\n", prefix);
         }