diff --git a/check_webservice_load.sh b/check_webservice_load.sh index 06c2d19..23b7590 100755 --- a/check_webservice_load.sh +++ b/check_webservice_load.sh @@ -441,11 +441,11 @@ if $check_php_fpm ; then # - Is Service exclusive controlled by systemd # - if systemctl -t service list-unit-files \ - | grep -e "^php-$_version" \ + | grep -E "^php-?$_version" \ | grep -q enabled 2> /devnull ; then PHP_FPM_SERVICE_FILE=$(systemctl -t service list-unit-files \ - | grep -e "^php-$_version" \ + | grep -E "^php-?$_version" \ | awk '{print$1}') fi fi @@ -958,7 +958,7 @@ stop_php_fpm() { declare -i i=0 - PIDS=$(ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') + PIDS=$(ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]?${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') while [ "X$PIDS" != "X" ]; do @@ -1004,14 +1004,14 @@ stop_php_fpm() { sleep 2 - PIDS=$(ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') + PIDS=$(ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]?${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') i=i+1 done declare -i i=0 - PIDS=$(ps aux | grep "php-fpm: " | grep -E "(pool|master)" | grep -E "\-${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') + PIDS=$(ps aux | grep "php-fpm: " | grep -E "(pool|master)" | grep -E "[-|\(]?${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') while [ "X$PIDS" != "X" ]; do @@ -1052,7 +1052,7 @@ stop_php_fpm() { done sleep 2 - PIDS=$(ps aux | grep "php-fpm: " | grep -E "(pool|master)" | grep -E "\-${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') + PIDS=$(ps aux | grep "php-fpm: " | grep -E "(pool|master)" | grep -E "[-|\(]?${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}') i=i+1 @@ -1441,7 +1441,7 @@ start_php_fpm() { fi sleep 2 - NEWPID=`ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}'` + NEWPID=`ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]?${php_fpm_pid_search_path[$__version]}" | grep -v grep | awk '{print$2}'` if [ "X${NEWPID}X" = "XX" ]; then @@ -1666,7 +1666,7 @@ graceful_restart_php_fpm() { fi sleep 2 - NEWPID=`ps aux | grep "php-fpm: " | grep " master " | grep "[-|\(]${php_fpm_pid_search_path[\"$__version\"]}" | grep -v grep | awk '{print$2}'` + NEWPID=`ps aux | grep "php-fpm: " | grep " master " | grep -E "[-|\(]?${php_fpm_pid_search_path[\"$__version\"]}" | grep -v grep | awk '{print$2}'` if [ "X${NEWPID}X" = "XX" ]; then @@ -2051,7 +2051,7 @@ if $check_php_fpm ; then if $LOGGING ; then echo -e "\nChecking PHP-FPM v$_version (FastCGI Process Manager) on \"`hostname -f`\".." fi - PID=$(ps aux | grep "php-fpm: " | grep "master" | grep -E "[-|\(]${php_fpm_pid_search_path[$_version]}" | grep -v grep | awk '{print$2}') + PID=$(ps aux | grep "php-fpm: " | grep "master" | grep -E "[-|\(]?${php_fpm_pid_search_path[$_version]}" | grep -v grep | awk '{print$2}') if [ "X${PID}X" = "XX" ];then