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