daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
7e7c9f
From d081baa951ee0d1c918170c7c666208fe04944e2 Mon Sep 17 00:00:00 2001
7e7c9f
From: Lennart Poettering <lennart@poettering.net>
7e7c9f
Date: Fri, 8 Sep 2017 17:24:57 +0200
7e7c9f
Subject: [PATCH] core: downgrade log message about inability to propagate
7e7c9f
 cgroup release message
7e7c9f
7e7c9f
If dbus is already down during shutdown, we can't propagate the cgroup
7e7c9f
release message anymore, but that's expected and nothing to warn about.
7e7c9f
Hence let's downgrade the message from LOG_WARN to LOG_DEBUG.
7e7c9f
7e7c9f
Fixes: #6777
7e7c9f
(cherry picked from commit d5f1532657da107f1c8be8a97c15d964cd96665c)
7e7c9f
7e7c9f
Resolves: #1679934
7e7c9f
---
7e7c9f
 src/core/dbus.c    | 2 +-
7e7c9f
 src/core/manager.c | 2 +-
7e7c9f
 2 files changed, 2 insertions(+), 2 deletions(-)
7e7c9f
7e7c9f
diff --git a/src/core/dbus.c b/src/core/dbus.c
7e7c9f
index d551eab016..9d19138ab3 100644
7e7c9f
--- a/src/core/dbus.c
7e7c9f
+++ b/src/core/dbus.c
7e7c9f
@@ -93,7 +93,7 @@ int bus_forward_agent_released(Manager *m, const char *path) {
7e7c9f
                                "Released",
7e7c9f
                                "s", path);
7e7c9f
         if (r < 0)
7e7c9f
-                return log_warning_errno(r, "Failed to propagate agent release message: %m");
7e7c9f
+                return log_debug_errno(r, "Failed to propagate agent release message: %m");
7e7c9f
 
7e7c9f
         return 1;
7e7c9f
 }
7e7c9f
diff --git a/src/core/manager.c b/src/core/manager.c
7e7c9f
index 4c87ad8a2f..7bbe912dc9 100644
7e7c9f
--- a/src/core/manager.c
7e7c9f
+++ b/src/core/manager.c
7e7c9f
@@ -1666,7 +1666,7 @@ static int manager_dispatch_cgroups_agent_fd(sd_event_source *source, int fd, ui
7e7c9f
         buf[n] = 0;
7e7c9f
 
7e7c9f
         manager_notify_cgroup_empty(m, buf);
7e7c9f
-        bus_forward_agent_released(m, buf);
7e7c9f
+        (void) bus_forward_agent_released(m, buf);
7e7c9f
 
7e7c9f
         return 0;
7e7c9f
 }