shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-02 10:51:20 +03:00
Code

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

Browse Source 
No change in behaviour, just better wording.
This commit is contained in:
Lennart Poettering 2018-11-13 12:00:42 +01:00
parent 209de5256b
commit 4b66bccab0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/dbus.c
View File

@ -56,13 +56,12 @@ int bus_send_pending_reload_message(Manager *m) {
if (!m->pending_reload_message) if (!m->pending_reload_message)
return 0; return 0;
/* If we cannot get rid of this message we won't dispatch any /* If we cannot get rid of this message we won't dispatch any D-Bus messages, so that we won't end up wanting
* D-Bus messages, so that we won't end up wanting to queue * to queue another message. */
* another message. */
r = sd_bus_send(NULL, m->pending_reload_message, NULL); r = sd_bus_send(NULL, m->pending_reload_message, NULL);
if (r < 0) 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); m->pending_reload_message = sd_bus_message_unref(m->pending_reload_message);