Up to 1.21.4.

[packages/nginx.git] / nginx.init

diff --git a/nginx.init b/nginx.init
index 10e1779748e979fe9a45874753ceb84baa6da2c0..1d62b97a8577ea655521e4496666881d7440489d 100755 (executable)
--- a/nginx.init
+++ b/nginx.init
@@ -1,13 +1,13 @@
 #!/bin/sh
 #
-# nginx        Nginx Web Server (@flavor@ version)
+# nginx        Nginx Web Server (@type@ version)
 #
 # chkconfig:   345 85 15
 # description:  Nginx is an HTTP(S) server, HTTP(S) reverse \
 #               proxy and IMAP/POP3 proxy server
-# processname: nginx-@flavor@
-# pidfile:     /var/run/nginx-@flavor@.pid
-# config:      /etc/nginx/nginx-@flavor@.conf
+# processname: nginx
+# pidfile:     /var/run/nginx.pid
+# config:      /etc/nginx/nginx.conf
 
 # Source function library
 . /etc/rc.d/init.d/functions
@@ -15,8 +15,8 @@
 # Source networking configuration.
 . /etc/sysconfig/network
 
-nginx="/usr/sbin/nginx-@flavor@"
-svname="nginx (@flavor@)"
+nginx="/usr/sbin/nginx"
+svname="nginx"
 prog=${nginx##*/}
 
 sysconfig="/etc/sysconfig/$prog"
@@ -88,8 +88,14 @@ start() {
 }
 
 stop() {
+       local oldbin_pidfile="${pidfile}.oldbin"
+
        # Stop daemons.
        if [ -f $lockfile ]; then
+               if [ -f $oldbin_pidfile ] && [ -f $pidfile ]; then
+                       msg_stopping "$svname (old process)"
+                       killproc -p $oldbin_pidfile $prog -TERM
+               fi
                msg_stopping "$svname"
                killproc -p $pidfile $prog
                RETVAL=$?
@@ -127,26 +133,41 @@ condrestart() {
 # http://nginx.org/en/docs/control.html#upgrade
 # TODO: handle revert back on failed upgrade
 upgrade() {
-       local oldbin_pidfile="${pidfile}.oldbin"
+       local oldbin_pidfile="${pidfile}.oldbin" retry
 
        checkconfig
        show "Upgrading $svname"
        killproc -p $pidfile $prog -USR2
        RETVAL=$?
-       sleep 1
-       if [ -f $oldbin_pidfile ] && [ -f $pidfile ]; then
-               show "Upgrade: stopping old process"
-               killproc -p $oldbin_pidfile $prog -QUIT
-               return 0
-       else
-               return 1
-       fi
+
+       # wait for 15s
+       retry=60
+       while [ $retry -gt 0 ]; do
+               if [ -f $oldbin_pidfile ] && [ -f $pidfile ]; then
+                       show "Upgrade: stopping old process"
+                       killproc -p $oldbin_pidfile $prog -QUIT
+                       return 0
+               else
+                       usleep 250000
+                       retry=$(($retry -1))
+               fi
+       done
+
+       show "Upgrade: stopping old process"; fail
+       nls 'old process pid file was not found'
+       return 1
 }
 
 # Tell nginx to reopen logs
 # http://nginx.org/en/docs/control.html#logs
 reopen_logs() {
-       checkconfig
+       local oldbin_pidfile="${pidfile}.oldbin"
+
+       if [ -f $oldbin_pidfile ]; then
+               show "Reopening $svname (oldbin) logs"
+               killproc -p $oldbin_pidfile $prog -USR1
+       fi
+
        show "Reopening $svname logs"
        killproc -p $pidfile $prog -USR1
 }
@@ -171,7 +192,7 @@ case "$1" in
   reload|graceful)
        reload
        ;;
-  force-reload|upgrade) 
+  force-reload|upgrade)
        upgrade
        ;;
   reopen-logs)