|
 |
84b277 |
From b0010d76a8c56900d15fab8ac1ed94d364d1e566 Mon Sep 17 00:00:00 2001
|
|
|
84b277 |
From: Lukas Nykryn <lnykryn@redhat.com>
|
|
|
84b277 |
Date: Wed, 23 Jul 2014 14:08:18 +0200
|
|
|
84b277 |
Subject: [PATCH] cgroups-agent: down-grade log level
|
|
|
84b277 |
|
|
|
84b277 |
(cherry picked from commit 844de4355592259eebcffddfc38c63266e451cb6)
|
|
|
84b277 |
|
|
|
84b277 |
Conflicts:
|
|
|
84b277 |
src/cgroups-agent/cgroups-agent.c
|
|
|
84b277 |
|
|
|
84b277 |
Resolves: #1044386
|
|
|
84b277 |
---
|
|
|
84b277 |
src/cgroups-agent/cgroups-agent.c | 8 ++++++--
|
|
|
84b277 |
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
84b277 |
|
|
|
84b277 |
diff --git a/src/cgroups-agent/cgroups-agent.c b/src/cgroups-agent/cgroups-agent.c
|
|
|
84b277 |
index a47949a..43b9b3a 100644
|
|
|
84b277 |
--- a/src/cgroups-agent/cgroups-agent.c
|
|
|
84b277 |
+++ b/src/cgroups-agent/cgroups-agent.c
|
|
|
84b277 |
@@ -50,7 +50,11 @@ int main(int argc, char *argv[]) {
|
|
|
84b277 |
|
|
|
84b277 |
bus = dbus_connection_open_private("unix:path=/run/systemd/private", &error);
|
|
|
84b277 |
if (!bus) {
|
|
|
84b277 |
- log_warning("Failed to get D-Bus connection: %s", bus_error_message(&error));
|
|
|
84b277 |
+ log_warning("Failed to get D-Bus connection: %s", strerror(-r));
|
|
|
84b277 |
+ /* If we couldn't connect we assume this was triggered
|
|
|
84b277 |
+ * while systemd got restarted/transitioned from
|
|
|
84b277 |
+ * initrd to the system, so let's ignore this */
|
|
|
84b277 |
+ log_debug("Failed to get D-Bus connection: %s", strerror(-r));
|
|
|
84b277 |
goto finish;
|
|
|
84b277 |
}
|
|
|
84b277 |
|
|
|
84b277 |
@@ -73,7 +77,7 @@ int main(int argc, char *argv[]) {
|
|
|
84b277 |
}
|
|
|
84b277 |
|
|
|
84b277 |
if (!dbus_connection_send(bus, m, NULL)) {
|
|
|
84b277 |
- log_error("Failed to send signal message on private connection.");
|
|
|
84b277 |
+ log_debug("Failed to send signal message on private connection.");
|
|
|
84b277 |
goto finish;
|
|
|
84b277 |
}
|
|
|
84b277 |
|