rel 2; improve upgrade process; wait longer (with big config files reloading thakes...

[packages/nginx.git] / nginx.init

diff --git a/nginx.init b/nginx.init
index 1d62b97a8577ea655521e4496666881d7440489d..64a967058cd87ca261a358defaa9239fe2278830 100755 (executable)
--- a/nginx.init
+++ b/nginx.init
@@ -140,11 +140,13 @@ upgrade() {
        killproc -p $pidfile $prog -USR2
        RETVAL=$?
 
-       # wait for 15s
-       retry=60
+       # wait for 3m
+       retry=720
        while [ $retry -gt 0 ]; do
                if [ -f $oldbin_pidfile ] && [ -f $pidfile ]; then
-                       show "Upgrade: stopping old process"
+                        show "Upgrade: stopping old workers"
+                        killproc -p $oldbin_pidfile $prog -WINCH
+                       show "Upgrade: stopping old master process"
                        killproc -p $oldbin_pidfile $prog -QUIT
                        return 0
                else