From 752bbf75b9b52c0faae29bb4b77a99c4bb0d298f Mon Sep 17 00:00:00 2001 From: Tom Gundersen Date: Thu, 28 Aug 2014 15:48:07 +0200 Subject: [PATCH] sd-event: use event source name rather than address in debug messages --- src/libsystemd/sd-event/sd-event.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c index a2935abd6..c92e065c7 100644 --- a/src/libsystemd/sd-event/sd-event.c +++ b/src/libsystemd/sd-event/sd-event.c @@ -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); -- 2.30.2