Commit:    ee01af7df149da2c511b0f91db2e161eebb2bf58
Author:    Lior Kaplan <kaplanl...@gmail.com>         Thu, 16 May 2013 19:46:53 
+0300
Committer: Stanislav Malyshev <s...@php.net>      Sun, 16 Jun 2013 16:54:49 
-0700
Parents:   2a93fd134751585630c9fef5280299254099a2da
Branches:  PHP-5.4 PHP-5.5 master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=ee01af7df149da2c511b0f91db2e161eebb2bf58

Log:
Fix bug #64764: Add status option to fpm init.d script

Bugs:
https://bugs.php.net/64764

Changed paths:
  M  NEWS
  M  sapi/fpm/init.d.php-fpm.in


Diff:
diff --git a/NEWS b/NEWS
index bf96674..98b2ee0 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 49cce79..020b942 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
        ;;


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to