Просмотр исходного кода

Fix bug in 1.4.6 with restarting service not working

Jaap Marcus 4 лет назад
Родитель
Сommit
99b76fdeb3
1 измененных файлов с 8 добавлено и 15 удалено
  1. 8 15
      bin/v-restart-service

+ 8 - 15
bin/v-restart-service

@@ -33,26 +33,19 @@ is_format_valid 'service' 'restart'
 #                       Action                             #
 #----------------------------------------------------------#
 
-if [ -d /usr/sbin/php*/fpm/ ]; then 
+# Multi-instance service restart request handling
+if [ "$service" = "php-fpm" ];then
+    service_list=''
     # Get installed php versions
     php_versions=$(ls /usr/sbin/php*fpm* | cut -d'/' -f4 | sed 's|php-fpm||')
-    
     # Substitute php-fpm service name formats
     for version in $php_versions; do
-        if [ "$service" = "php-fpm${version}" ]; then
-            service="php${version}-fpm"
-        fi
+        service_list="${service_list} php${version}-fpm"
     done
-    
-    # Multi-instance service restart request handling
-    if [ "$service" = "php-fpm" ];then
-        for version in $php_versions; do
-            service_list="${service_list} php${version}-fpm"
-        done
-    else
-        service_list="$service"
-    fi
-fi 
+else
+    service_list="$service"
+fi
+
 for service in $service_list; do
 
     if [ "$service" = "iptables" ]; then