SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yu Watanabe
2025-04-30 19:40:39 +09:00
parent 46fcdc3d73
commit 7aef80e0bd
2 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/busctl/busctl.c
+18 -2
View File
@@ -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) {
src/libsystemd/sd-bus/bus-dump.c
+9 -9
View File
@@ -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);
}