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

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

diff --git a/nginx.spec b/nginx.spec
index ba8ce205ad4e61f3f1853e488ca2e82ecdc3cd1e..5c9a0082835ba80c915f464b6d801ea1d4db3564 100644 (file)
--- a/nginx.spec
+++ b/nginx.spec
@@ -51,7 +51,7 @@ Summary(pl.UTF-8):    Serwer HTTP i odwrotne proxy o wysokiej wydajności
 # http://nginx.org/en/download.html
 Name:          nginx
 Version:       1.24.0
-Release:       1
+Release:       2
 License:       BSD-like
 Group:         Networking/Daemons/HTTP
 Source0:       https://nginx.org/download/%{name}-%{version}.tar.gz