sd-bus: when debug logging about messages, show the same bits of it everywhere
Also, include the message signature everywhere.
This commit is contained in:
parent
665dfe9318
commit
e32fd6b47c
|
@ -362,13 +362,18 @@ int bus_maybe_reply_error(sd_bus_message *m, int r, sd_bus_error *error) {
|
|||
} else
|
||||
return r;
|
||||
|
||||
log_debug("Failed to process message [type=%s sender=%s path=%s interface=%s member=%s signature=%s]: %s",
|
||||
log_debug("Failed to process message type=%s sender=%s destination=%s path=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " signature=%s error-name=%s error-message=%s: %s",
|
||||
bus_message_type_to_string(m->header->type),
|
||||
strna(m->sender),
|
||||
strna(m->path),
|
||||
strna(m->interface),
|
||||
strna(m->member),
|
||||
strna(sd_bus_message_get_sender(m)),
|
||||
strna(sd_bus_message_get_destination(m)),
|
||||
strna(sd_bus_message_get_path(m)),
|
||||
strna(sd_bus_message_get_interface(m)),
|
||||
strna(sd_bus_message_get_member(m)),
|
||||
BUS_MESSAGE_COOKIE(m),
|
||||
m->reply_cookie,
|
||||
strna(m->root_container.signature),
|
||||
strna(m->error.name),
|
||||
strna(m->error.message),
|
||||
bus_error_message(error, r));
|
||||
|
||||
return 1;
|
||||
|
|
|
@ -57,7 +57,7 @@
|
|||
#define log_debug_bus_message(m) \
|
||||
do { \
|
||||
sd_bus_message *_mm = (m); \
|
||||
log_debug("Got message type=%s sender=%s destination=%s object=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " error-name=%s error-message=%s", \
|
||||
log_debug("Got message type=%s sender=%s destination=%s path=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " signature=%s error-name=%s error-message=%s", \
|
||||
bus_message_type_to_string(_mm->header->type), \
|
||||
strna(sd_bus_message_get_sender(_mm)), \
|
||||
strna(sd_bus_message_get_destination(_mm)), \
|
||||
|
@ -66,6 +66,7 @@
|
|||
strna(sd_bus_message_get_member(_mm)), \
|
||||
BUS_MESSAGE_COOKIE(_mm), \
|
||||
_mm->reply_cookie, \
|
||||
strna(_mm->root_container.signature), \
|
||||
strna(_mm->error.name), \
|
||||
strna(_mm->error.message)); \
|
||||
} while (false)
|
||||
|
@ -1467,7 +1468,7 @@ static int bus_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call
|
|||
return r;
|
||||
|
||||
if (*idx >= BUS_MESSAGE_SIZE(m))
|
||||
log_debug("Sent message type=%s sender=%s destination=%s object=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " error-name=%s error-message=%s",
|
||||
log_debug("Sent message type=%s sender=%s destination=%s path=%s interface=%s member=%s cookie=%" PRIu64 " reply_cookie=%" PRIu64 " signature=%s error-name=%s error-message=%s",
|
||||
bus_message_type_to_string(m->header->type),
|
||||
strna(sd_bus_message_get_sender(m)),
|
||||
strna(sd_bus_message_get_destination(m)),
|
||||
|
@ -1476,6 +1477,7 @@ static int bus_write_message(sd_bus *bus, sd_bus_message *m, bool hint_sync_call
|
|||
strna(sd_bus_message_get_member(m)),
|
||||
BUS_MESSAGE_COOKIE(m),
|
||||
m->reply_cookie,
|
||||
strna(m->root_container.signature),
|
||||
strna(m->error.name),
|
||||
strna(m->error.message));
|
||||
|
||||
|
|
Loading…
Reference in New Issue