- always do graceful shutdown

Changed files:
    php-fpm.init -> 1.5

diff --git a/php-fpm.init b/php-fpm.init
index 830fdb4080fedf52ab258a9fe5934375a64c2c19..943d78d423c92ea5cb8aea96dc7a4094ac4e81a4 100644 (file)
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -36,18 +36,7 @@ stop() {
        if [ -f /var/lock/subsys/php-fpm ]; then
                # Stop daemons.
                msg_stopping "PHP FastCGI Process Manager"
-               killproc --pidfile $pidfile php-fpm -TERM
-               rm -f /var/lock/subsys/php-fpm
-       else
-               msg_not_running "PHP FastCGI Process Manager"
-       fi
-}
-
-# Gracefully shutting down php_fpm
-quit() {
-       if [ -f /var/lock/subsys/php-fpm ]; then
-               # Stop daemons.
-               msg_stopping "PHP FastCGI Process Manager"
+               # always gracefully shut down php-fpm
                killproc --pidfile $pidfile php-fpm -QUIT
                rm -f /var/lock/subsys/php-fpm
        else
@@ -84,7 +73,7 @@ case "$1" in
   start)
        start
        ;;
-  stop)
+  stop|quit)
        stop
        ;;
   restart)
@@ -97,9 +86,6 @@ case "$1" in
   reload|force-reload)
        reload USR2 7
        ;;
-  quit) # graceful shutdown
-       quit
-       ;;
   flush-logs|logrotate)
        reload USR1 0
        ;;