summaryrefslogtreecommitdiffstats
path: root/httpd.service
diff options
context:
space:
mode:
authorJan Kaluza <jkaluza@redhat.com>2014-09-01 09:32:54 +0200
committerJan Kaluza <jkaluza@redhat.com>2014-09-01 09:32:54 +0200
commit36930381bc186af121a2439f92b8fe2c2c6f3acc (patch)
treebef2a8284c6877156c321d6ce21c134b98e8ab92 /httpd.service
parent92ee9cf6266fdce7ecf4071fa1bdc2b0b5558ab4 (diff)
downloadhttpd-36930381bc186af121a2439f92b8fe2c2c6f3acc.tar.gz
httpd-36930381bc186af121a2439f92b8fe2c2c6f3acc.tar.xz
httpd-36930381bc186af121a2439f92b8fe2c2c6f3acc.zip
use KillMode=mixed in httpd.service (#1135122)
Diffstat (limited to 'httpd.service')
-rw-r--r--httpd.service10
1 files changed, 3 insertions, 7 deletions
diff --git a/httpd.service b/httpd.service
index 04c43e2..f7a01e4 100644
--- a/httpd.service
+++ b/httpd.service
@@ -24,13 +24,9 @@ Environment=LANG=C
ExecStart=/usr/sbin/httpd $OPTIONS -DFOREGROUND
ExecReload=/usr/sbin/httpd $OPTIONS -k graceful
-ExecStop=/bin/kill -WINCH ${MAINPID}
-# We want systemd to give httpd some time to finish gracefully, but still want
-# it to kill httpd after TimeoutStopSec if something went wrong during the
-# graceful stop. Normally, Systemd sends SIGTERM signal right after the
-# ExecStop, which would kill httpd. We are sending useless SIGCONT here to give
-# httpd time to finish.
-KillSignal=SIGCONT
+# Send SIGWINCH for graceful stop
+KillSignal=SIGWINCH
+KillMode=mixed
PrivateTmp=true
[Install]