bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eldbus: print dbus errors incurred when failing at signal handler operations 

seeing these errors is significantly more helpful when debugging why the system
is not responding as expected
This commit is contained in:
Mike Blumenkrantz 2016-02-19 13:23:24 -05:00
parent 2cf1f0e6e3
commit f7cd667766
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/lib/eldbus/eldbus_signal_handler.c
View File

@ -79,6 +79,8 @@ eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap)
dbus_error_init(&err);
dbus_bus_remove_match(sh->conn->dbus_conn,
eina_strbuf_string_get(sh->match), &err);
if (dbus_error_is_set(&err))
ERR("handler(%p): %s - %s", sh, err.name, err.message);
EINA_SAFETY_ON_TRUE_RETURN_VAL(dbus_error_is_set(&err), EINA_FALSE);
for (read = va_arg(ap, char *); read; read = va_arg(ap, char *))
@ -114,6 +116,8 @@ eldbus_signal_handler_match_extra_vset(Eldbus_Signal_Handler *sh, va_list ap)
dbus_error_init(&err);
dbus_bus_add_match(sh->conn->dbus_conn,
eina_strbuf_string_get(sh->match), &err);
if (dbus_error_is_set(&err))
ERR("handler(%p): %s - %s", sh, err.name, err.message);
if (!dbus_error_is_set(&err))
return EINA_TRUE;
@ -125,7 +129,7 @@ error:
dbus_bus_add_match(sh->conn->dbus_conn,
eina_strbuf_string_get(sh->match), &err);
if (dbus_error_is_set(&err))
ERR("Error setting partial extra arguments.");
ERR("handler(%p): %s - %s", sh, err.name, err.message);
return EINA_FALSE;
}
@ -194,6 +198,8 @@ _eldbus_signal_handler_add(Eldbus_Connection *conn, const char *sender, const ch
dbus_error_init(&err);
dbus_bus_add_match(conn->dbus_conn, eina_strbuf_string_get(match), &err);
if (dbus_error_is_set(&err))
ERR("handler(%p): %s - %s", sh, err.name, err.message);
if (dbus_error_is_set(&err)) goto cleanup;
if (sender)
@ -237,6 +243,8 @@ _eldbus_signal_handler_clean(Eldbus_Signal_Handler *handler)
dbus_error_init(&err);
dbus_bus_remove_match(handler->conn->dbus_conn,
eina_strbuf_string_get(handler->match), &err);
if (dbus_error_is_set(&err))
ERR("error removing handler(%p): %s - %s", handler, err.name, err.message);
handler->dangling = EINA_TRUE;
}