[packages/nginx] rel 2; improve upgrade process; wait longer (with big config files reloading thakes a lot of time)

arekm arekm at pld-linux.org
Mon Jun 12 12:04:18 CEST 2023


commit b2f0901dd9337623c767cb042bd707ee116fd9b6
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Mon Jun 12 12:03:41 2023 +0200

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

 nginx.init | 8 +++++---
 nginx.spec | 2 +-
 2 files changed, 6 insertions(+), 4 deletions(-)
---
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
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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/b2f0901dd9337623c767cb042bd707ee116fd9b6



More information about the pld-cvs-commit mailing list