From: Lennart Poettering <lennart@poettering.net>
Date: Wed, 11 Feb 2015 20:25:30 +0000 (+0100)
Subject: core: don't watch for socket events when service is in SERVICE_STOP
X-Git-Tag: v219~67
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=d54ddab8cbad46290306fc6e3346089fe3772d5c;ds=inline

core: don't watch for socket events when service is in SERVICE_STOP

If a service has an ExecStop= program that uses the socket the service was
activated by to tell it to terminate, then that should not be used as
trigger to start the service again.

http://lists.freedesktop.org/archives/systemd-devel/2015-February/028058.html
---

diff --git a/src/core/socket.c b/src/core/socket.c
index d3dabc85f..48c43a288 100644
--- a/src/core/socket.c
+++ b/src/core/socket.c
@@ -2603,10 +2603,6 @@ static void socket_trigger_notify(Unit *u, Unit *other) {
                 socket_notify_service_dead(s, se->result == SERVICE_FAILURE_START_LIMIT);
 
         if (se->state == SERVICE_DEAD ||
-            se->state == SERVICE_STOP ||
-            se->state == SERVICE_STOP_SIGTERM ||
-            se->state == SERVICE_STOP_SIGKILL ||
-            se->state == SERVICE_STOP_POST ||
             se->state == SERVICE_FINAL_SIGTERM ||
             se->state == SERVICE_FINAL_SIGKILL ||
             se->state == SERVICE_AUTO_RESTART)