Upstream/ansible-role-php
1
0
Fork 0
mirror of https://github.com/geerlingguy/ansible-role-php.git synced 2024-11-27 12:35:11 +01:00
Code Issues Projects Releases Wiki Activity

Fixes #94: PHP-FPM init script for build from source causes 30s delay when stopping via systemd.

Browse Source
This commit is contained in:
Jeff Geerling 2016-03-16 12:14:13 -05:00
parent 82a0856f91
commit e03ffd0104
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
templates/fpm-init.j2
View File

@ -17,7 +17,7 @@ NAME={{ php_fpm_daemon }}
DAEMON=/usr/sbin/$NAME DAEMON=/usr/sbin/$NAME
DAEMON_ARGS="--daemonize --fpm-config {{ php_fpm_conf_path }}/php-fpm.conf" DAEMON_ARGS="--daemonize --fpm-config {{ php_fpm_conf_path }}/php-fpm.conf"
PIDFILE=/var/run/{{ php_fpm_daemon }}.pid PIDFILE=/var/run/{{ php_fpm_daemon }}.pid
TIMEOUT=30 TIMEOUT=2
SCRIPTNAME=/etc/init.d/$NAME SCRIPTNAME=/etc/init.d/$NAME
# Exit if the package is not installed # Exit if the package is not installed
@ -85,7 +85,7 @@ do_stop()
# that waits for the process to drop all resources that could be # that waits for the process to drop all resources that could be
# needed by services started subsequently. A last resort is to # needed by services started subsequently. A last resort is to
# sleep for some time. # sleep for some time.
start-stop-daemon --stop --quiet --oknodo --retry=0/30/TERM/5/KILL/5 --exec $DAEMON start-stop-daemon --stop --quiet --oknodo --retry=0/$TIMEOUT/TERM/5/KILL/5 --exec $DAEMON
[ "$?" = 2 ] && return 2 [ "$?" = 2 ] && return 2
# Many daemons don't delete their pidfiles when they exit. # Many daemons don't delete their pidfiles when they exit.
rm -f $PIDFILE rm -f $PIDFILE