[packages/nginx] cleanup apache leftovers

glen glen at pld-linux.org
Sun May 3 22:20:03 CEST 2015


commit ff4955e8782eb7195ddf68bf888532e0e4d236dd
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun May 3 23:19:22 2015 +0300

    cleanup apache leftovers
    
    from b9f99299

 nginx.init | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)
---
diff --git a/nginx.init b/nginx.init
index 38c75cd..4d618f0 100755
--- a/nginx.init
+++ b/nginx.init
@@ -91,11 +91,8 @@ stop() {
 	# Stop daemons.
 	if [ -f $lockfile ]; then
 		msg_stopping "$svname"
-		killproc --waitforname $prog --waitfortime 60 $prog
-		# Delete pidfile only when nginx was called successfully
-		if [ $? -eq 0 ]; then
-			rm -f $lockfile $pidfile >/dev/null 2>&1
-		fi
+		killproc $prog
+		rm -f $lockfile $pidfile >/dev/null 2>&1
 	else
 		msg_not_running "$svname"
 	fi
================================================================

---- gitweb:

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



More information about the pld-cvs-commit mailing list