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

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
+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) {