picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

sd-event: use event source name rather than address in debug messages

Browse source
This commit is contained in:
Tom Gundersen 2014-08-28 15:48:07 +02:00
parent f7f53e9e6e
commit 752bbf75b9
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libsystemd/sd-event/sd-event.c
View file

@ -2112,8 +2112,12 @@ static int source_dispatch(sd_event_source *s) {
s->dispatching = false;
if (r < 0)
log_debug("Event source %p returned error, disabling: %s", s, strerror(-r));
if (r < 0) {
if (s->name)
log_debug("Event source '%s' returned error, disabling: %s", s->name, strerror(-r));
else
log_debug("Event source %p returned error, disabling: %s", s, strerror(-r));
}
if (s->n_ref == 0)
source_free(s);
@ -2146,8 +2150,12 @@ static int event_prepare(sd_event *e) {
r = s->prepare(s, s->userdata);
s->dispatching = false;
if (r < 0)
log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r));
if (r < 0) {
if (s->name)
log_debug("Prepare callback of event source '%s' returned error, disabling: %s", s->name, strerror(-r));
else
log_debug("Prepare callback of event source %p returned error, disabling: %s", s, strerror(-r));
}
if (s->n_ref == 0)
source_free(s);