summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2018-11-13 12:00:42 +0100
committerLennart Poettering <lennart@poettering.net>2018-11-13 12:01:22 +0100
commit4b66bccab004221b903b43b4c224442bfa3e9ac7 (patch)
tree2462ec68acf35baf4ab3e312b8b64011b6a2bd77
parent209de5256b7ba8600c3e73a85a43b86708998d65 (diff)
downloadsystemd-4b66bccab004221b903b43b4c224442bfa3e9ac7.tar.gz
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.
-rw-r--r--src/core/dbus.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/core/dbus.c b/src/core/dbus.c
index b16b742a4a..6c00f734a4 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);