[systemd-commits] src/core

[Lennart Poettering]

 src/core/socket.c |    4 ----
 1 file changed, 4 deletions(-)

New commits:
commit d54ddab8cbad46290306fc6e3346089fe3772d5c
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Feb 11 21:25:30 2015 +0100

    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 d3dabc8..48c43a2 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)