summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-11 21:25:30 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-11 21:25:30 +0100
commitd54ddab8cbad46290306fc6e3346089fe3772d5c (patch)
tree25f596ed62fc35bfc7733089829111e3075b6f13
parentc31c4324c5120d9b38f8a5e39623c8242ee001e0 (diff)
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
-rw-r--r--src/core/socket.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/core/socket.c b/src/core/socket.c
index d3dabc85f2..48c43a2880 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)