X-Git-Url: https://git.tld-linux.org/?p=packages%2Fphp.git;a=blobdiff_plain;f=php-fpm.init;h=381be8da71f9af4ee66d0e06c224ed09fe4d793e;hp=125922be2c5d652452f96586ecfdf1c2a0657243;hb=954ecf20c48c9867c06e3142115d609ad4c9e81c;hpb=aef9a98d7828aeb48703ab2429a6968173d1addf

diff --git a/php-fpm.init b/php-fpm.init
index 125922b..381be8d 100644
--- a/php-fpm.init
+++ b/php-fpm.init
@@ -1,12 +1,12 @@
 #!/bin/sh
 #
-# php-fpm	PHP FastCGI Process Manager
+# @processname@	PHP FastCGI Process Manager
 #
 # chkconfig:	345 80 30
 #
 # description:	PHP FastCGI Process Manager
 #
-# processname:	php-fpm
+# processname:	@processname@
 # config:	/etc/php/php-fpm.conf
 # pidfile:	/var/run/@processname@.pid
 #
@@ -22,28 +22,66 @@ lockfile=/var/lock/subsys/@processname@
 pidfile=$(sed -ne  's,^pid\s*=\s*\(.*\),\1,p' $configfile)
 pidfile=${pidfile:-/var/run/@processname@.pid}
 
+# configtest itself
+# must return non-zero if check failed
+# output is discarded if checkconfig is ran without details
+configtest() {
+	/usr/sbin/@processname@ --fpm-config $configfile -t
+	return $?
+}
+
+# wrapper for configtest
+checkconfig() {
+	local details=${1:-0}
+
+	if [ $details = 1 ]; then
+		# run config test and display report (status action)
+		show "Checking %s configuration" "PHP FastCGI Process Manager"; busy
+		local out
+		out=$(configtest 2>&1)
+		RETVAL=$?
+		if [ $RETVAL = 0 ]; then
+			ok
+		else
+			fail
+		fi
+		[ "$out" ] && echo >&2 "$out"
+	else
+		# run config test and abort with nice message if failed
+		# (for actions checking status before action).
+		configtest >/dev/null 2>&1
+		RETVAL=$?
+		if [ $RETVAL != 0 ]; then
+			show "Checking %s configuration" "PHP FastCGI Process Manager"; fail
+			nls 'Configuration test failed. See details with %s "checkconfig"' $0
+			exit $RETVAL
+		fi
+	fi
+}
+
 start() {
 	# Check if the service is already running?
 	if [ -f $lockfile ]; then
-		msg_already_running "PHP FastCGI Process Manager"
+		msg_already_running "PHP FastCGI Process Manager (@processname@)"
 		return
 	fi
 
+	checkconfig
 	msg_starting "PHP FastCGI Process Manager (@processname@)"
-	daemon --pidfile $pidfile /usr/sbin/@processname@ --fpm-config $configfile
+	daemon --redirfds --pidfile $pidfile /usr/sbin/@processname@ --fpm-config $configfile
 	RETVAL=$?
 	[ $RETVAL -eq 0 ] && touch $lockfile
 }
 
 stop() {
 	if [ ! -f $lockfile ]; then
-		msg_not_running "PHP FastCGI Process Manager"
+		msg_not_running "PHP FastCGI Process Manager (@processname@)"
 		return
 	fi
 
 	# Stop daemons.
-	msg_stopping "PHP FastCGI Process Manager"
-	# always gracefully shut down php-fpm
+	msg_stopping "PHP FastCGI Process Manager (@processname@)"
+	# always gracefully shut down @processname@
 	/sbin/start-stop-daemon -q --stop -s QUIT --retry QUIT/600/TERM/10 --pidfile $pidfile
 	[ "$?" -eq 0 ] && ok || fail
 	rm -f $lockfile
@@ -53,23 +91,25 @@ reload() {
 	local sig=${1:-HUP}
 	local retnr=${2:-7}
 	if [ ! -f $lockfile ]; then
-		msg_not_running "PHP FastCGI Process Manager"
+		msg_not_running "PHP FastCGI Process Manager (@processname@)"
 		RETVAL=$retnr
 		return
 	fi
 
-	msg_reloading "PHP FastCGI Process Manager"
-	killproc --pidfile $pidfile php-fpm -$sig
+	checkconfig
+	msg_reloading "PHP FastCGI Process Manager (@processname@)"
+	killproc --pidfile $pidfile @processname@ -$sig
 	RETVAL=$?
 }
 
 condrestart() {
 	if [ ! -f $lockfile ]; then
-		msg_not_running "PHP FastCGI Process Manager"
+		msg_not_running "PHP FastCGI Process Manager (@processname@)"
 		RETVAL=$1
 		return
 	fi
 
+	checkconfig
 	stop
 	start
 }
@@ -93,6 +133,9 @@ case "$1" in
   reload|force-reload)
 	reload USR2 7
 	;;
+  checkconfig|configtest)
+	checkconfig 1
+	;;
   flush-logs|logrotate)
 	reload USR1 0
 	;;
@@ -101,7 +144,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   *)
-	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|flush-logs|status}"
+	msg_usage "$0 {start|stop|restart|try-restart|reload|force-reload|flush-logs|checkconfig|status}"
 	exit 3
 	;;
 esac