sd-event: implicitly set signal event source's descriptions to the signal name

diff --git a/src/journal-remote/journal-remote.c b/src/journal-remote/journal-remote.c
index 03410c7925ddb4334c73860d3d73d0f9185fb87e..7239b8cc6d0a191e53bcaa594922bc1f1c59289a 100644 (file)
--- a/src/journal-remote/journal-remote.c
+++ b/src/journal-remote/journal-remote.c
@@ -803,18 +803,10 @@ static int setup_signals(RemoteServer *s) {
         if (r < 0)
                 return r;
 
-        r = sd_event_source_set_description(s->sigterm_event, "sigterm");
-        if (r < 0)
-                return r;
-
         r = sd_event_add_signal(s->events, &s->sigint_event, SIGINT, NULL, s);
         if (r < 0)
                 return r;
 
-        r = sd_event_source_set_description(s->sigint_event, "sigint");
-        if (r < 0)
-                return r;
-
         return 0;
 }
 

diff --git a/src/libsystemd/sd-event/sd-event.c b/src/libsystemd/sd-event/sd-event.c
index f0356a48e647f90711699daf7062852c00b5a595..e856d682514f527df654add8a923b729178b80e3 100644 (file)
--- a/src/libsystemd/sd-event/sd-event.c
+++ b/src/libsystemd/sd-event/sd-event.c
@@ -1031,6 +1031,9 @@ _public_ int sd_event_add_signal(
                 }
         }
 
+        /* Use the signal name as description for the event source by default */
+        (void) sd_event_source_set_description(s, signal_to_string(sig));
+
         if (ret)
                 *ret = s;