Explorar el Código

Blacklist hestia service for reload eligibility

Kristan Kenney hace 6 años
padre
commit
d29cebcb18
Se han modificado 1 ficheros con 6 adiciones y 2 borrados
  1. 6 2
      bin/v-restart-service

+ 6 - 2
bin/v-restart-service

@@ -28,20 +28,24 @@ check_args '1' "$#" 'SERVICE'
 #                       Action                             #
 #                       Action                             #
 #----------------------------------------------------------#
 #----------------------------------------------------------#
 
 
-if [ "$service" != "iptables" ] || [ "$service" !="cron" ] || [ "$service" !="mysql" ]; then
+if [ "$service" != "iptables" ] || [ "$service" != "cron" ] || [ "$service" != "mysql" ] || [ "$service" != "hestia" ]; then
+    # Perform a configuration reload so that process is not terminated
+    # resulting in less server downtime.
     systemctl reload $service > /dev/null 2>&1
     systemctl reload $service > /dev/null 2>&1
     if [ $? -ne 0 ]; then
     if [ $? -ne 0 ]; then
         check_result $E_RESTART "ERROR: Restart of $service failed."
         check_result $E_RESTART "ERROR: Restart of $service failed."
         log_history "Restart of $service failed."
         log_history "Restart of $service failed."
     fi
     fi
 elif [ "$service" = "iptables" ]; then
 elif [ "$service" = "iptables" ]; then
+    # Restart rules for firewall
     $BIN/v-stop-firewall
     $BIN/v-stop-firewall
     $BIN/v-update-firewall
     $BIN/v-update-firewall
     if [ $? -ne 0 ]; then
     if [ $? -ne 0 ]; then
         check_result $E_RESTART "ERROR: Restart of $service failed."
         check_result $E_RESTART "ERROR: Restart of $service failed."
         log_history "Restart of $service failed."
         log_history "Restart of $service failed."
     fi
     fi
-else 
+elif [ "$service" = "cron" ] || [ "$service" = "mysql" ] || [ "$service" = "hestia" ]; then
+    # Restart services not eligible for configuration reload
     systemctl restart $service > /dev/null 2>&1
     systemctl restart $service > /dev/null 2>&1
     if [ $? -ne 0 ]; then
     if [ $? -ne 0 ]; then
         check_result $E_RESTART "ERROR: Restart of $service failed."
         check_result $E_RESTART "ERROR: Restart of $service failed."