[gentoo-commits] gentoo-x86 commit in dev-lang/php/files: php-fpm.init

[Ole Markus With (olemarkus)]

olemarkus    11/11/18 08:41:13

  Modified:             php-fpm.init
  Log:
  Fixed init script for multislotting. Bug 390307. Thanks to Guillaume Castagnino and Piotr Karbowski for input
  
  (Portage version: 2.2.0_alpha71/cvs/Linux x86_64)

Revision  Changes    Path
1.2                  dev-lang/php/files/php-fpm.init

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/php-fpm.init?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/php-fpm.init?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-lang/php/files/php-fpm.init?r1=1.1&r2=1.2

Index: php-fpm.init
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-lang/php/files/php-fpm.init,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- php-fpm.init	26 Jul 2010 13:42:12 -0000	1.1
+++ php-fpm.init	18 Nov 2011 08:41:13 -0000	1.2
@@ -1,8 +1,15 @@
 #!/sbin/runscript
 
-PHP_FPM_CONF="/etc/php/fpm-php5/php-fpm.conf"
+set_phpvars() {
+	PHPSLOT=${SVCNAME#php-fpm-}
+	[ ${PHPSLOT} = 'php-fpm' ] && PHPSLOT="$(eselect php show fpm)"
 
-opts="depend start stop reload"
+	PHP_FPM_CONF="/etc/php/fpm-${PHPSLOT}/php-fpm.conf"
+	PHP_FPM_PID="/var/run/php-fpm-${PHPSLOT}.pid"
+}
+
+extra_commands="depend"
+extra_started_commands="reload"
 
 depend() {
 	need net
@@ -10,13 +17,31 @@
 }
 
 start() {
-	ebegin "Starting PHP FastCGI server"
-	start-stop-daemon --start --exec /usr/bin/php-fpm -- -y "${PHP_FPM_CONF}"
-	eend $?
+        ebegin "Starting PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --start --pidfile ${PHP_FPM_PID} --exec \
+            /usr/lib/${PHPSLOT}/bin/php-fpm -- -y "${PHP_FPM_CONF}" -g "${PHP_FPM_PID}"
+        local i=0
+        local timeout=5
+        while [ ! -f ${PHP_FPM_PID} ] && [ $i -le $timeout ]; do
+            sleep 1
+            i=$(($i + 1))
+        done
+        
+        [ $timeout -gt $i ]
+        eend $?
 }
 
 stop() {
-	ebegin "Stopping PHP FastCGI server"
-	start-stop-daemon --stop --name php-fpm
-	eend $?
+        ebegin "Stopping PHP FastCGI Process Manager"
+	set_phpvars
+        start-stop-daemon --signal QUIT --stop --exec /usr/lib/${PHPSLOT}/bin/php-fpm --pidfile ${PHP_FPM_PID}
+        eend $?
+}
+
+reload() {
+    ebegin "Reloading PHP FastCGI Process Manager"
+    set_phpvars
+    [ -f ${PHP_FPM_PID} ] && kill -USR2 $(cat ${PHP_FPM_PID})
+    eend $?
 }