From 5d652391908e48fa3e8badd56bd47cbaa83794fa Mon Sep 17 00:00:00 2001 From: midoks Date: Sun, 3 Jul 2022 13:52:34 +0800 Subject: [PATCH] Revert "up" This reverts commit 574b1e62b99a6f55d3efd6c74d303eae3c9264a1. --- plugins/php/conf/php-fpm-52.conf | 2 +- plugins/php/index.py | 4 ++ plugins/php/init.d/php52.tpl | 139 +++++++++++++++++++++++++++++++++++++ plugins/php/versions/52/install.sh | 4 +- 4 files changed, 145 insertions(+), 4 deletions(-) create mode 100644 plugins/php/init.d/php52.tpl diff --git a/plugins/php/conf/php-fpm-52.conf b/plugins/php/conf/php-fpm-52.conf index 444c2c816..6552b797e 100644 --- a/plugins/php/conf/php-fpm-52.conf +++ b/plugins/php/conf/php-fpm-52.conf @@ -6,7 +6,7 @@
Pid file - /www/server/php/52/var/run/php-fpm.pid + /www/server/php/52/var/log/php-fpm.pid Error log file /www/server/php/52/var/log/php-fpm.log diff --git a/plugins/php/index.py b/plugins/php/index.py index e6ee08b24..010114d3e 100755 --- a/plugins/php/index.py +++ b/plugins/php/index.py @@ -228,6 +228,10 @@ def initReplace(version): file_bin = initD_path + '/php' + version if not os.path.exists(file_bin): file_tpl = getPluginDir() + '/init.d/php.tpl' + + if version == '52': + file_tpl = getPluginDir() + '/init.d/php52.tpl' + content = mw.readFile(file_tpl) content = contentReplace(content, version) diff --git a/plugins/php/init.d/php52.tpl b/plugins/php/init.d/php52.tpl new file mode 100644 index 000000000..49b94dba4 --- /dev/null +++ b/plugins/php/init.d/php52.tpl @@ -0,0 +1,139 @@ +#! /bin/sh + +php_fpm_BIN=/www/server/php/52/bin/php-cgi +php_fpm_CONF=/www/server/php/52/etc/php-fpm.conf +php_fpm_PID=/www/server/php/52//var/log/php-fpm.pid + + +php_opts="--fpm-config $php_fpm_CONF" + + +wait_for_pid () { + try=0 + + while test $try -lt 35 ; do + + case "$1" in + 'created') + if [ -f "$2" ] ; then + try='' + break + fi + ;; + + 'removed') + if [ ! -f "$2" ] ; then + try='' + break + fi + ;; + esac + + echo -n . + try=`expr $try + 1` + sleep 1 + + done + +} + +case "$1" in + start) + echo -n "Starting php_fpm " + + $php_fpm_BIN --fpm $php_opts + + if [ "$?" != 0 ] ; then + echo " failed" + exit 1 + fi + + wait_for_pid created $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed" + exit 1 + else + echo " done" + fi + ;; + + stop) + echo -n "Shutting down php_fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -TERM `cat $php_fpm_PID` + + wait_for_pid removed $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed" + exit 1 + else + echo " done" + fi + ;; + + quit) + echo -n "Gracefully shutting down php_fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -QUIT `cat $php_fpm_PID` + + wait_for_pid removed $php_fpm_PID + + if [ -n "$try" ] ; then + echo " failed" + exit 1 + else + echo " done" + fi + ;; + + restart) + $0 stop + $0 start + ;; + + reload) + + echo -n "Reload service php-fpm " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -USR2 `cat $php_fpm_PID` + + echo " done" + ;; + + logrotate) + + echo -n "Re-opening php-fpm log file " + + if [ ! -r $php_fpm_PID ] ; then + echo "warning, no pid file found - php-fpm is not running ?" + exit 1 + fi + + kill -USR1 `cat $php_fpm_PID` + + echo " done" + ;; + + *) + echo "Usage: $0 {start|stop|quit|restart|reload|logrotate}" + exit 1 + ;; + +esac diff --git a/plugins/php/versions/52/install.sh b/plugins/php/versions/52/install.sh index fb957937e..30378f0c4 100755 --- a/plugins/php/versions/52/install.sh +++ b/plugins/php/versions/52/install.sh @@ -161,10 +161,8 @@ if [ ! -d $serverPath/php/${PHP_VER}/lib/php/extensions/no-debug-non-zts-2006061 mkdir -p $serverPath/php/${PHP_VER}/lib/php/extensions/no-debug-non-zts-20060613 fi -# ps -ef|grep php/52 |grep -v grep |awk '{print $2}'|xargs kill -# /www/server/php/init.d/php52 start + mkdir -p $serverPath/php/${PHP_VER}/var/log -mkdir -p $serverPath/php/${PHP_VER}/var/run #------------------------ install end ------------------------------------# }