Skip to content

Commit 4779348

Browse files
committed
restart error handler
1 parent 42dfa03 commit 4779348

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+297
-9
lines changed

bin/v-add-cron-job

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,9 @@ increase_user_value $user '$U_CRON_JOBS'
7474

7575
# Restart crond
7676
$BIN/v-restart-cron
77+
if [ $? -ne 0 ]; then
78+
exit E_RESTART
79+
fi
7780

7881
# Logging
7982
log_history "added cron job $job"

bin/v-add-cron-report

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ sync_cron_jobs
4646

4747
# Restart crond
4848
$BIN/v-restart-cron
49+
if [ $? -ne 0 ]; then
50+
exit E_RESTART
51+
fi
4952

5053
# Logging
5154
log_history "enabled cron reporting"

bin/v-add-dns-domain

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ increase_user_value "$user" '$U_DNS_RECORDS' "$records"
162162
# Restart named
163163
if [ "$restart" != 'no' ]; then
164164
$BIN/v-restart-dns
165+
if [ $? -ne 0 ]; then
166+
exit E_RESTART
167+
fi
165168
fi
166169

167170
# Logging

bin/v-add-dns-record

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,9 @@ increase_user_value "$user" '$U_DNS_RECORDS'
107107
# Restart named
108108
if [ "$restart" != 'no' ]; then
109109
$BIN/v-restart-dns
110+
if [ $? -ne 0 ]; then
111+
exit E_RESTART
112+
fi
110113
fi
111114

112115
# Logging

bin/v-add-sys-ip

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,13 @@ fi
152152

153153
# Restart web server
154154
$BIN/v-restart-web
155+
if [ $? -ne 0 ]; then
156+
exit E_RESTART
157+
fi
155158
$BIN/v-restart-proxy
159+
if [ $? -ne 0 ]; then
160+
exit E_RESTART
161+
fi
156162

157163
# Logging
158164
log_history "added system ip address $ip" '' 'admin'

bin/v-add-web-domain

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,9 @@ chmod 660 $USER_DATA/web.conf
176176
# Restart web server
177177
if [ "$restart" != 'no' ]; then
178178
$BIN/v-restart-web
179+
if [ $? -ne 0 ]; then
180+
exit E_RESTART
181+
fi
179182
fi
180183

181184
# Logging

bin/v-add-web-domain-alias

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,14 @@ increase_user_value "$user" '$U_WEB_ALIASES'
103103
# Adding task to the vesta pipe
104104
if [ "$restart" != 'no' ]; then
105105
$BIN/v-restart-web
106+
if [ $? -ne 0 ]; then
107+
exit E_RESTART
108+
fi
109+
106110
$BIN/v-restart-proxy
111+
if [ $? -ne 0 ]; then
112+
exit E_RESTART
113+
fi
107114
fi
108115

109116
log_history "added $dom_alias as alias for $domain"

bin/v-add-web-domain-proxy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,9 @@ update_object_value 'web' 'DOMAIN' "$domain" '$PROXY_EXT' "$extentions"
103103
# Restart web server
104104
if [ "$restart" != 'no' ]; then
105105
$BIN/v-restart-proxy
106+
if [ $? -ne 0 ]; then
107+
exit E_RESTART
108+
fi
106109
fi
107110

108111
log_history "enabled proxy support for $domain"

bin/v-add-web-domain-ssl

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,14 @@ update_object_value 'web' 'DOMAIN' "$domain" '$SSL' "yes"
126126
# Restart web server
127127
if [ "$restart" != 'no' ]; then
128128
$BIN/v-restart-web
129+
if [ $? -ne 0 ]; then
130+
exit E_RESTART
131+
fi
132+
133+
$BIN/v-restart-proxy
134+
if [ $? -ne 0 ]; then
135+
exit E_RESTART
136+
fi
129137
fi
130138

131139
# Logging

bin/v-change-cron-job

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,9 @@ sync_cron_jobs
6565

6666
# Restart crond
6767
$BIN/v-restart-cron
68+
if [ $? -ne 0 ]; then
69+
exit E_RESTART
70+
fi
6871

6972
# Logging
7073
log_history "changed cron job $job"

0 commit comments

Comments
 (0)