From: Arkadiusz Miśkiewicz <arekm@maven.pl>
Date: Mon, 12 Jun 2023 10:03:41 +0000 (+0200)
Subject: rel 2; improve upgrade process; wait longer (with big config files reloading thakes... 
X-Git-Tag: auto/th/nginx-1.24.0-2
X-Git-Url: http://git.pld-linux.org/?a=commitdiff_plain;h=b2f0901dd9337623c767cb042bd707ee116fd9b6;hp=b9e2f214c63181322ecdc5ae1da3dd9310d17dc0;p=packages%2Fnginx.git

rel 2; improve upgrade process; wait longer (with big config files reloading thakes a lot of time)
---

diff --git a/nginx.init b/nginx.init
index 1d62b97..64a9670 100755
--- 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 ba8ce20..5c9a008 100644
--- 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