restart error handler

bin/v-add-cron-job

@@ -74,6 +74,9 @@ increase_user_value $user '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added cron job $job"

bin/v-add-cron-report

@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "enabled cron reporting"

bin/v-add-dns-domain

@@ -162,6 +162,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-dns-record

@@ -107,6 +107,9 @@ increase_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-sys-ip

@@ -152,7 +152,13 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "added system ip address $ip" '' 'admin'

bin/v-add-web-domain

@@ -176,6 +176,9 @@ chmod 660 $USER_DATA/web.conf
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-add-web-domain-alias

@@ -103,7 +103,14 @@ increase_user_value "$user" '$U_WEB_ALIASES'
 # Adding task to the vesta pipe
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "added $dom_alias as alias for $domain"

bin/v-add-web-domain-proxy

@@ -103,6 +103,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 log_history "enabled proxy support for $domain"

bin/v-add-web-domain-ssl

@@ -126,6 +126,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-cron-job

@@ -65,6 +65,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed cron job $job"

bin/v-change-dns-domain-ip

@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-soa

@@ -64,6 +64,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-tpl

@@ -88,6 +88,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-domain-ttl

@@ -63,6 +63,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-record

@@ -98,6 +98,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-dns-record-id

@@ -70,6 +70,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-sys-ip-nat

@@ -77,6 +77,9 @@ fi
 # Restart ftp server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-ftp
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-ip

@@ -87,7 +87,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$IP' "$3"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-proxy-tpl

@@ -94,6 +94,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-change-web-domain-sslcert

@@ -71,7 +71,14 @@ fi
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl certificate for $domain"

bin/v-change-web-domain-sslhome

@@ -71,7 +71,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL_HOME' "$SSL_HOME"
 
 # Restart web server
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "changed ssl home for $domain to $ssl_home"

bin/v-change-web-domain-tpl

@@ -96,6 +96,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$TPL' "$template"
 # Restart web
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-cron-job

@@ -54,6 +54,9 @@ decrease_user_value "$user" '$U_CRON_JOBS'
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted cron job $job"

bin/v-delete-cron-reports

@@ -46,6 +46,9 @@ sync_cron_jobs
 
 # Restart crond
 $BIN/v-restart-cron
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "disabled cron reporting"

bin/v-delete-dns-domain

@@ -75,6 +75,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS' "$records"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-dns-domains

@@ -43,6 +43,9 @@ done
 
 # Restart named
 $BIN/v-restart-dns
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_event "$OK" "$EVENT"

bin/v-delete-dns-domains-src

@@ -46,6 +46,9 @@ done
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-dns-record

@@ -69,6 +69,9 @@ decrease_user_value "$user" '$U_DNS_RECORDS'
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-domain

@@ -39,7 +39,7 @@ if [ ! -z "$WEB_SYSTEM" ] && [ "$WEB_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_web" ]; then
         $BIN/v-delete-web-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -50,7 +50,7 @@ if [ ! -z "$DNS_SYSTEM" ] && [ "$DNS_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_dns" ]; then
         $BIN/v-delete-dns-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi
@@ -61,7 +61,7 @@ if [ ! -z "$MAIL_SYSTEM" ] && [ "$MAIL_SYSTEM" != 'no' ]; then
     if [  ! -z "$check_mail" ]; then
         $BIN/v-delete-mail-domain $user $domain
         if [ $? -ne 0 ]; then
-            exit $?
+            exit E_RESTART
         fi
     fi
 fi

bin/v-delete-sys-ip

@@ -121,7 +121,14 @@ fi
 
 # Adding task to the vesta pipe
 $BIN/v-restart-web
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
+
 $BIN/v-restart-proxy
+if [ $? -ne 0 ]; then
+    exit E_RESTART
+fi
 
 # Logging
 log_history "deleted system ip address $ip"

bin/v-delete-web-domain

@@ -154,7 +154,14 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-alias

@@ -101,7 +101,14 @@ decrease_user_value "$user" '$U_WEB_ALIASES'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-proxy

@@ -80,6 +80,9 @@ fi
 # Restart proxy server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domain-ssl

@@ -92,7 +92,14 @@ decrease_user_value "$user" '$U_WEB_SSL'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-delete-web-domains

@@ -45,7 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-domain

@@ -72,6 +72,9 @@ chmod 660 $USER_DATA/dns.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-record

@@ -47,6 +47,9 @@ echo "$data" >> $USER_DATA/dns/$domain.conf
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns $restart
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-insert-dns-records

@@ -50,6 +50,9 @@ fi
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-cron-jobs

@@ -43,6 +43,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-dns-domain

@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns "$restart"
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-dns-domains

@@ -78,6 +78,9 @@ update_user_value "$user" '$SUSPENDED_DNS' "$suspended_dns"
 # Restart named
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-rebuild-web-domains

@@ -148,7 +148,14 @@ update_user_value "$user" '$U_WEB_ALIASES' "$user_aliases"
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-restart-dns

@@ -56,6 +56,7 @@ if [ $? -ne 0 ]; then
     /etc/init.d/$DNS_SYSTEM restart >/dev/null 2>&1
     if [ $? -ne 0 ]; then
         send_email_report
+        echo "Error: $DNS_SYSTEM restart failed"
         exit $E_RESTART
     fi
 fi

bin/v-restart-ftp

@@ -48,6 +48,7 @@ fi
 /etc/init.d/$FTP_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $FTP_SYSTEM restart failed"
     exit $E_RESTART
 fi
 

bin/v-restart-mail

@@ -49,6 +49,7 @@ fi
 /etc/init.d/$MAIL_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
     send_email_report
+    echo "Error: $MAIL_SYSTEM restart failed"
     exit $E_RESTART
 fi
 

bin/v-restart-proxy

@@ -45,13 +45,11 @@ if [ -z "$PROXY_SYSTEM" ]; then
 fi
 
 # Restart system
-/etc/init.d/$PROXY_SYSTEM reload >/dev/null 2>&1
+/etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
 if [ $? -ne 0 ]; then
-    /etc/init.d/$PROXY_SYSTEM restart >/dev/null 2>&1
-    if [ $? -ne 0 ]; then
-        send_email_report
-        exit $E_RESTART
-    fi
+    send_email_report
+    echo "Error: $PROXY_SYSTEM restart failed"
+    exit $E_RESTART
 fi
 
 # Update restart queue

bin/v-restart-web

@@ -53,6 +53,7 @@ if [ "$WEB_SYSTEM" == 'apache2' ]; then
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi
@@ -62,6 +63,7 @@ else
         /etc/init.d/$WEB_SYSTEM restart >/dev/null 2>&1
         if [ $? -ne 0 ]; then
             send_email_report
+            echo "Error: $WEB_SYSTEM restart failed"
             exit $E_RESTART
         fi
     fi

bin/v-restore-user

@@ -372,7 +372,15 @@ if [ "$web" != 'no' ]; then
 
     # Restart WEB
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -482,6 +490,10 @@ if [ "$dns" != 'no' ]; then
 
     # Restart DNS
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi
@@ -695,6 +707,10 @@ if [ "$cron" != 'no' ]; then
 
     # Restart cron
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     echo
     msg="$msg\n"
 fi

bin/v-suspend-cron-job

@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-cron-jobs

@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-dns-domain

@@ -49,6 +49,9 @@ increase_user_value "$user" '$SUSPENDED_DNS'
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-dns-domains

@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-dns-record

@@ -63,6 +63,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-suspend-user

@@ -71,8 +71,19 @@ fi
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Changing suspend value

bin/v-suspend-web-domain

@@ -91,7 +91,14 @@ increase_user_value "$user" '$SUSPENDED_WEB'
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-suspend-web-domains

@@ -45,6 +45,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-cron-job

@@ -49,6 +49,9 @@ sync_cron_jobs
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-cron-jobs

@@ -44,6 +44,9 @@ done
 # Restart crond
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-dns-domain

@@ -51,6 +51,9 @@ sed -i "s/SUSPENDED='yes'/SUSPENDED='no'/g" $USER_DATA/dns/$domain.conf
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-dns-domains

@@ -45,6 +45,9 @@ done
 # Restart dns server
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-dns-record

@@ -62,6 +62,9 @@ update_domain_zone
 # Restart named
 #if [ "$restart" != 'no' ]; then
 #    $BIN/v-restart-dns
+#    if [ $? -ne 0 ]; then
+#        exit E_RESTART
+#    fi
 #fi
 
 # Logging

bin/v-unsuspend-user

@@ -73,8 +73,19 @@ decrease_user_value 'admin' '$SUSPENDED_USERS'
 
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-dns
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-cron
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-web-domain

@@ -88,7 +88,14 @@ decrease_user_value "$user" '$SUSPENDED_WEB'
 # Restart web erver
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-unsuspend-web-domains

@@ -46,6 +46,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
+    $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Logging

bin/v-update-sys-ip

@@ -53,6 +53,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 /etc/$PROXY_SYSTEM/conf.d/$new.conf
             sed -i "s/$old/$new/g" /etc/$PROXY_SYSTEM/conf.d/$new.conf
             $BIN/v-restart-proxy
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
         if [ ! -z "$WEB_SYSTEM" ]; then
             mv /etc/$WEB_SYSTEM/conf.d/$old.conf \
@@ -65,6 +68,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-web-domains $user no
             done
             $BIN/v-restart-web
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         if [ ! -z "$DNS_SYSTEM" ]; then
@@ -75,6 +81,9 @@ if [ ! -z "$vst_ip_list" ] && [ "$vst_ip_num" -eq '1' ]; then
                 $BIN/v-rebuild-dns-domains $user no
             done
             $BIN/v-restart-dns
+            if [ $? -ne 0 ]; then
+                exit E_RESTART
+            fi
         fi
 
         # No further comparation is needed

bin/v-update-web-templates

@@ -64,7 +64,14 @@ done
 # Restart web server
 if [ "$restart" != 'no' ]; then
     $BIN/v-restart-web
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
+
     $BIN/v-restart-proxy
+    if [ $? -ne 0 ]; then
+        exit E_RESTART
+    fi
 fi
 
 # Delete tmpdir