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