anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0240-core-print-debug-instead-of-error-message.patch

84b277
From bcbb894a709f56ac0bccf7e5edfd59e39e8ec800 Mon Sep 17 00:00:00 2001
84b277
From: Michal Sekletar <msekleta@redhat.com>
84b277
Date: Wed, 14 May 2014 15:13:43 +0200
84b277
Subject: [PATCH] core: print debug instead of error message
84b277
84b277
In case that session scope is in some other state than SCOPE_RUNNING or
84b277
SCOPE_ABANDONED we will not print error message. It might be the case
84b277
that scope is in other state because systemd realized that scope is
84b277
empty before dispatching dbus call from pam hook. Or system is going
84b277
down and stop job is runnig for the scope and changed scope state to
84b277
SCOPE_STOP_SIGTERM or SCOPE_STOP_SIGKILL.
84b277
84b277
(cherry picked from commit f517790db5277fa71d6ae3617244f1acc4b62572)
84b277
84b277
Resolves: #1105608
84b277
---
84b277
 src/core/dbus-scope.c | 2 +-
84b277
 1 file changed, 1 insertion(+), 1 deletion(-)
84b277
84b277
diff --git a/src/core/dbus-scope.c b/src/core/dbus-scope.c
84b277
index 58dd9ff..71d6921 100644
84b277
--- a/src/core/dbus-scope.c
84b277
+++ b/src/core/dbus-scope.c
84b277
@@ -76,7 +76,7 @@ DBusHandlerResult bus_scope_message_handler(Unit *u, DBusConnection *c, DBusMess
84b277
 
84b277
                 r = scope_abandon(s);
84b277
                 if (r < 0)
84b277
-                        log_error("Failed to mark scope %s as abandoned : %s", UNIT(s)->id, strerror(-r));
84b277
+                        log_debug("Failed to mark scope %s as abandoned : Scope is not running", UNIT(s)->id);
84b277
 
84b277
                 reply = dbus_message_new_method_return(message);
84b277
                 if (!reply)