summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLior Kaplan <kaplanlior@gmail.com>2013-05-16 19:46:53 +0300
committerStanislav Malyshev <stas@php.net>2013-06-16 16:54:49 -0700
commitee01af7df149da2c511b0f91db2e161eebb2bf58 (patch)
treedbbd465514f95a2a52ac58d270d1d5157b518a0d
parent2a93fd134751585630c9fef5280299254099a2da (diff)
downloadphp-git-ee01af7df149da2c511b0f91db2e161eebb2bf58.tar.gz
Fix bug #64764: Add status option to fpm init.d script
-rw-r--r--NEWS1
-rw-r--r--sapi/fpm/init.d.php-fpm.in16
2 files changed, 16 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index bf96674d01..98b2ee0faa 100644
--- a/NEWS
+++ b/NEWS
@@ -18,6 +18,7 @@ PHP NEWS
- FPM:
. Fixed Bug #64915 (error_log ignored when daemonize=0). (Remi)
+ . Implemented FR #64764 (add support for FPM init.d script). (Lior Kaplan)
- PDO:
. Fixed bug #63176 (Segmentation fault when instantiate 2 persistent PDO to
diff --git a/sapi/fpm/init.d.php-fpm.in b/sapi/fpm/init.d.php-fpm.in
index 49cce79ae9..020b942f14 100644
--- a/sapi/fpm/init.d.php-fpm.in
+++ b/sapi/fpm/init.d.php-fpm.in
@@ -91,6 +91,20 @@ case "$1" in
fi
;;
+ status)
+ if [ ! -r $php_fpm_PID ] ; then
+ echo "php-fpm is stopped"
+ exit 0
+ fi
+
+ PID=`cat $php_fpm_PID`
+ if ps -p $PID | grep -q $PID; then
+ echo "php-fpm (pid $PID) is running..."
+ else
+ echo "php-fpm dead but pid file exists"
+ fi
+ ;;
+
force-quit)
echo -n "Terminating php-fpm "
@@ -131,7 +145,7 @@ case "$1" in
;;
*)
- echo "Usage: $0 {start|stop|force-quit|restart|reload}"
+ echo "Usage: $0 {start|stop|force-quit|restart|reload|status}"
exit 1
;;