chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: be a bit more verbose when debug mode is on
[elogind.git]
/
src
/
libsystemd-bus
/
sd-bus.c
diff --git
a/src/libsystemd-bus/sd-bus.c
b/src/libsystemd-bus/sd-bus.c
index 6e4406857326e3f66dc3693817b4a3def0e771be..3a4821319e49c61de056abf73374cc06573f0f0b 100644
(file)
--- a/
src/libsystemd-bus/sd-bus.c
+++ b/
src/libsystemd-bus/sd-bus.c
@@
-141,6
+141,8
@@
static void bus_free(sd_bus *b) {
free(b->address);
free(b->kernel);
free(b->machine);
free(b->address);
free(b->kernel);
free(b->machine);
+ free(b->fake_label);
+ free(b->cgroup_root);
free(b->exec_path);
strv_free(b->exec_argv);
free(b->exec_path);
strv_free(b->exec_argv);
@@
-374,7
+376,7
@@
static int bus_send_hello(sd_bus *bus) {
r = sd_bus_message_new_method_call(
bus,
"org.freedesktop.DBus",
r = sd_bus_message_new_method_call(
bus,
"org.freedesktop.DBus",
- "/",
+ "/
org/freedesktop/DBus
",
"org.freedesktop.DBus",
"Hello",
&m);
"org.freedesktop.DBus",
"Hello",
&m);
@@
-2101,11
+2103,16
@@
static int process_message(sd_bus *bus, sd_bus_message *m) {
bus->current = m;
bus->iteration_counter++;
bus->current = m;
bus->iteration_counter++;
- log_debug("Got message sender=%s object=%s interface=%s member=%s",
+ log_debug("Got message type=%s sender=%s destination=%s object=%s interface=%s member=%s serial=%lu reply_serial=%lu error=%s",
+ bus_message_type_to_string(m->header->type),
strna(sd_bus_message_get_sender(m)),
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_path(m)),
strna(sd_bus_message_get_interface(m)),
- strna(sd_bus_message_get_member(m)));
+ strna(sd_bus_message_get_member(m)),
+ (unsigned long) m->header->serial,
+ (unsigned long) m->reply_serial,
+ strna(m->error.message));
r = process_hello(bus, m);
if (r != 0)
r = process_hello(bus, m);
if (r != 0)
@@
-2171,6
+2178,12
@@
static int process_running(sd_bus *bus, sd_bus_message **ret) {
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) {
if (m->header->type == SD_BUS_MESSAGE_METHOD_CALL) {
+ log_debug("Unprocessed message call sender=%s object=%s interface=%s member=%s",
+ strna(sd_bus_message_get_sender(m)),
+ strna(sd_bus_message_get_path(m)),
+ strna(sd_bus_message_get_interface(m)),
+ strna(sd_bus_message_get_member(m)));
+
r = sd_bus_reply_method_errorf(
m,
SD_BUS_ERROR_UNKNOWN_OBJECT,
r = sd_bus_reply_method_errorf(
m,
SD_BUS_ERROR_UNKNOWN_OBJECT,
@@
-2968,6
+2981,9
@@
_public_ int sd_bus_try_close(sd_bus *bus) {
if (bus->rqueue_size > 0)
return -EBUSY;
if (bus->rqueue_size > 0)
return -EBUSY;
+ if (bus->wqueue_size > 0)
+ return -EBUSY;
+
r = bus_kernel_try_close(bus);
if (r < 0)
return r;
r = bus_kernel_try_close(bus);
if (r < 0)
return r;