daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
36e8a3
From 52a474cf15bf2b0edb449750eb63eb8cdb9a3780 Mon Sep 17 00:00:00 2001
36e8a3
From: Lennart Poettering <lennart@poettering.net>
36e8a3
Date: Tue, 13 Nov 2018 12:00:42 +0100
36e8a3
Subject: [PATCH] core: when we can't send the pending reload message, say we
36e8a3
 ignore it in the warning we log
36e8a3
36e8a3
No change in behaviour, just better wording.
36e8a3
36e8a3
(cherry picked from commit 4b66bccab004221b903b43b4c224442bfa3e9ac7)
36e8a3
36e8a3
Resolves: #1647359
36e8a3
---
36e8a3
 src/core/dbus.c | 7 +++----
36e8a3
 1 file changed, 3 insertions(+), 4 deletions(-)
36e8a3
36e8a3
diff --git a/src/core/dbus.c b/src/core/dbus.c
4bff0a
index 256a410215..346a440c5d 100644
36e8a3
--- a/src/core/dbus.c
36e8a3
+++ b/src/core/dbus.c
36e8a3
@@ -55,13 +55,12 @@ int bus_send_pending_reload_message(Manager *m) {
36e8a3
         if (!m->pending_reload_message)
36e8a3
                 return 0;
36e8a3
 
36e8a3
-        /* If we cannot get rid of this message we won't dispatch any
36e8a3
-         * D-Bus messages, so that we won't end up wanting to queue
36e8a3
-         * another message. */
36e8a3
+        /* If we cannot get rid of this message we won't dispatch any D-Bus messages, so that we won't end up wanting
36e8a3
+         * to queue another message. */
36e8a3
 
36e8a3
         r = sd_bus_send(NULL, m->pending_reload_message, NULL);
36e8a3
         if (r < 0)
36e8a3
-                log_warning_errno(r, "Failed to send queued message: %m");
36e8a3
+                log_warning_errno(r, "Failed to send queued message, ignoring: %m");
36e8a3
 
36e8a3
         m->pending_reload_message = sd_bus_message_unref(m->pending_reload_message);
36e8a3