]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
core: when we can't send the pending reload message, say we ignore it in the warning...
authorLennart Poettering <lennart@poettering.net>
Tue, 13 Nov 2018 11:00:42 +0000 (12:00 +0100)
committerLukáš Nykrýn <lnykryn@redhat.com>
Tue, 4 Dec 2018 12:20:39 +0000 (13:20 +0100)
No change in behaviour, just better wording.

(cherry picked from commit 4b66bccab004221b903b43b4c224442bfa3e9ac7)

Resolves: #1647359

src/core/dbus.c

index 256a410215ff33326f8f956e4b0eb2c400f356d3..346a440c5dcac0b3af01ac599a821cdc687d41b3 100644 (file)
@@ -55,13 +55,12 @@ int bus_send_pending_reload_message(Manager *m) {
         if (!m->pending_reload_message)
                 return 0;
 
-        /* If we cannot get rid of this message we won't dispatch any
-         * D-Bus messages, so that we won't end up wanting to queue
-         * another message. */
+        /* If we cannot get rid of this message we won't dispatch any D-Bus messages, so that we won't end up wanting
+         * to queue another message. */
 
         r = sd_bus_send(NULL, m->pending_reload_message, NULL);
         if (r < 0)
-                log_warning_errno(r, "Failed to send queued message: %m");
+                log_warning_errno(r, "Failed to send queued message, ignoring: %m");
 
         m->pending_reload_message = sd_bus_message_unref(m->pending_reload_message);