[packages/nginx] - rel 2; stop now works even if we are in middle of binary upgrade (via force-reload aka USR2).
arekm
arekm at pld-linux.org
Wed Feb 6 15:48:58 CET 2019
commit 2349487995076bcc61bb90cdf71470302761dfa9
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Wed Feb 6 15:48:50 2019 +0100
- rel 2; stop now works even if we are in middle of binary upgrade (via force-reload aka USR2).
nginx.init | 6 ++++++
nginx.spec | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/nginx.spec b/nginx.spec
index 91e5703..ccf0ff7 100644
--- a/nginx.spec
+++ b/nginx.spec
@@ -42,7 +42,7 @@ Summary(pl.UTF-8): Serwer HTTP i odwrotne proxy o wysokiej wydajności
# - mainline: production quality but API can change
Name: nginx
Version: 1.15.8
-Release: 1
+Release: 2
License: BSD-like
Group: Networking/Daemons/HTTP
Source0: http://nginx.org/download/%{name}-%{version}.tar.gz
diff --git a/nginx.init b/nginx.init
index ef12b57..5ac987b 100755
--- a/nginx.init
+++ b/nginx.init
@@ -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=$?
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nginx.git/commitdiff/2349487995076bcc61bb90cdf71470302761dfa9
More information about the pld-cvs-commit
mailing list