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
(cherry picked from commit d54ddab8cb)
This commit is contained in:
Lennart Poettering
2015-03-23 02:08:22 -04:00
committed by Zbigniew Jędrzejewski-Szmek
parent 27834dd75b
commit 531201b4b6
-4
View File
@@ -2600,10 +2600,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)