From: Lennart Poettering <lennart@poettering.net>
Date: Tue, 13 Nov 2018 11:00:42 +0000 (+0100)
Subject: core: when we can't send the pending reload message, say we ignore it in the warning... 
X-Git-Tag: v240~326^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4b66bccab004221b903b43b4c224442bfa3e9ac7;p=thirdparty%2Fsystemd.git

core: when we can't send the pending reload message, say we ignore it in the warning we log

No change in behaviour, just better wording.
---

diff --git a/src/core/dbus.c b/src/core/dbus.c
index b16b742a4ab..6c00f734a4e 100644
--- a/src/core/dbus.c
+++ b/src/core/dbus.c
@@ -56,13 +56,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);