Skip to content

Commit 2dce1a5

Browse files
serghey-rodinserghey-rodin
committed
updated error code table
1 parent 6dbd3ad commit 2dce1a5

File tree

10 files changed

+51
-51
lines changed

10 files changed

+51
-51
lines changed

‎bin/v-add-backup-ftp-host‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ validate_format 'host' 'ftp_user' 'ftp_password'
5050
# Checking network connection
5151
if [ ! -z "$(ftpc)" ]; then
5252
echo "Error: can't login to ftp"
53-
log_event "$E_FTP" "$EVENT"
54-
exit $E_FTP
53+
log_event "$E_CONNECT" "$EVENT"
54+
exit $E_CONNECT
5555
fi
5656

5757
# Checking write permissions

‎bin/v-backup-user‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@ ftp_backup() {
529529
if [ ! -e "$VESTA/conf/ftp.backup.conf" ]; then
530530
ftp_conf_error="Can't open $VESTA/conf/ftp.backup.conf"
531531
echo "$ftp_conf_error" | $send_mail -s "$subj" $email
532-
echo "Error: $VESTA/conf/ftp.backup.conf does not exist"
532+
echo "Error: $VESTA/conf/ftp.backup.conf doesn't exist"
533533
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
534534
log_event "$E_NOTEXIST" "$EVENT"
535535
exit $E_NOTEXIST
@@ -565,8 +565,8 @@ ftp_backup() {
565565
$send_mail -s "$subj" $email
566566
echo "Error: can't login to ftp ftp://$USERNAME@$HOST"
567567
sed -i "/ $user /d" $VESTA/data/queue/backup.pipe
568-
log_event "$E_FTP" "$EVENT"
569-
exit $E_FTP
568+
log_event "$E_CONNECT" "$EVENT"
569+
exit $E_CONNECT
570570
fi
571571

572572
# Check ftp permissions

‎bin/v-change-sys-language‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ source $VESTA/func/main.sh
1919

2020
is_language_valid() {
2121
if [ ! -e "$VESTA/web/inc/i18n/$language.php" ]; then
22-
echo "Error: language $language not exist"
22+
echo "Error: language file $language doesn't exist"
2323
log_event "$E_NOTEXIST $EVENT"
2424
exit $E_NOTEXIST
2525
fi

‎bin/v-delete-mail-account-alias‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ is_object_valid "mail/$domain" 'ACCOUNT' "$account"
3838
is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
3939
aliases=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$ALIAS')
4040
if [ -z "$(echo $aliases | grep -w $malias)" ]; then
41-
echo "Error: alias $malias is not exist"
41+
echo "Error: alias $malias doesn't exist"
4242
log_event "$E_NOTEXIST $EVENT"
4343
exit $E_NOTEXIST
4444
fi

‎bin/v-delete-mail-account-forward‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ is_object_valid "mail/$domain" 'ACCOUNT' "$account"
3838
is_object_unsuspended "mail/$domain" 'ACCOUNT' "$account"
3939
fwd=$(get_object_value "mail/$domain" 'ACCOUNT' "$account" '$FWD')
4040
if [ -z "$(echo $fwd | grep -w $forward)" ]; then
41-
echo "Error: forward $forward is not exist"
41+
echo "Error: forward $forward doesn't exist"
4242
log_event "$E_NOTEXIST $EVENT"
4343
exit $E_NOTEXIST
4444
fi

‎bin/v-delete-web-domain-alias‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ is_object_unsuspended 'web' 'DOMAIN' "$domain"
3939
get_domain_values 'web'
4040
ip=$(get_real_ip $IP)
4141
if [ -z "$(echo $ALIAS | tr ',' '\n' | grep ^$dom_alias$)" ]; then
42-
echo "Error: alias $dom_alias not exist"
42+
echo "Error: alias $dom_alias doesn't exist"
4343
log_event "$E_NOTEXIST" "$EVENT"
4444
exit $E_NOTEXIST
4545
fi

‎bin/v-restore-user‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ source $VESTA/func/rebuild.sh
3636
# Check backup function
3737
is_backup_valid() {
3838
if [ ! -e "$BACKUP/$backup" ]; then
39-
echo "Error: backup not exist"
39+
echo "Error: backup doesn't exist"
4040
log_event "$E_NOTEXIST" "$EVENT"
4141
exit $E_NOTEXIST
4242
fi

‎func/db.sh‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ add_mysql_database() {
9898
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
9999
if [ '0' -ne "$?" ]; then
100100
echo "Error: Connection failed"
101-
log_event "$E_DB $EVENT"
102-
exit $E_DB
101+
log_event "$E_CONNECT $EVENT"
102+
exit $E_CONNECT
103103
fi
104104

105105

@@ -134,8 +134,8 @@ add_pgsql_database() {
134134
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
135135
if [ '0' -ne "$?" ]; then
136136
echo "Error: Connection failed"
137-
log_event "$E_DB" "$EVENT"
138-
exit $E_DB
137+
log_event "$E_CONNECT" "$EVENT"
138+
exit $E_CONNECT
139139
fi
140140

141141
query="CREATE ROLE $dbuser WITH LOGIN PASSWORD '$dbpass'"
@@ -177,8 +177,8 @@ is_mysql_host_alive() {
177177
mysql -h $host -u $dbuser -p$dbpass -e "$query" > /dev/null 2>&1
178178
if [ '0' -ne "$?" ]; then
179179
echo "Error: Connection to $host failed"
180-
log_event "$E_DB" "$EVENT"
181-
exit $E_DB
180+
log_event "$E_CONNECT" "$EVENT"
181+
exit $E_CONNECT
182182
fi
183183
}
184184

@@ -188,8 +188,8 @@ is_pgsql_host_alive() {
188188
psql -h $host -U $dbuser -c "SELECT VERSION()" > /dev/null 2>&1
189189
if [ '0' -ne "$?" ]; then
190190
echo "Error: Connection to $host failed"
191-
log_event "$E_DB" "$EVENT"
192-
exit $E_DB
191+
log_event "$E_CONNECT" "$EVENT"
192+
exit $E_CONNECT
193193
fi
194194
}
195195

@@ -213,8 +213,8 @@ change_mysql_password() {
213213
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
214214
if [ '0' -ne "$?" ]; then
215215
echo "Error: Connection failed"
216-
log_event "$E_DB $EVENT"
217-
exit $E_DB
216+
log_event "$E_CONNECT $EVENT"
217+
exit $E_CONNECT
218218
fi
219219

220220
query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\`
@@ -245,8 +245,8 @@ change_pgsql_password() {
245245
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
246246
if [ '0' -ne "$?" ]; then
247247
echo "Error: Connection failed"
248-
log_event "$E_DB" "$EVENT"
249-
exit $E_DB
248+
log_event "$E_CONNECT" "$EVENT"
249+
exit $E_CONNECT
250250
fi
251251

252252
query="ALTER ROLE $DBUSER WITH LOGIN PASSWORD '$dbpass'"
@@ -270,8 +270,8 @@ delete_mysql_database() {
270270
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
271271
if [ '0' -ne "$?" ]; then
272272
echo "Error: Connection failed"
273-
log_event "$E_DB $EVENT"
274-
exit $E_DB
273+
log_event "$E_CONNECT $EVENT"
274+
exit $E_CONNECT
275275
fi
276276

277277
query="DROP DATABASE \`$database\`"
@@ -307,8 +307,8 @@ delete_pgsql_database() {
307307
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
308308
if [ '0' -ne "$?" ]; then
309309
echo "Error: Connection failed"
310-
log_event "$E_DB" "$EVENT"
311-
exit $E_DB
310+
log_event "$E_CONNECT" "$EVENT"
311+
exit $E_CONNECT
312312
fi
313313

314314
query="REVOKE ALL PRIVILEGES ON DATABASE $database FROM $DBUSER"
@@ -344,8 +344,8 @@ dump_mysql_database() {
344344
echo "Can't connect to mysql server $HOST" |\
345345
$send_mail -s "$subj" $email
346346
echo "Error: Connection failed"
347-
log_event "$E_DB $EVENT"
348-
exit $E_DB
347+
log_event "$E_CONNECT $EVENT"
348+
exit $E_CONNECT
349349
fi
350350

351351
mysqldump -h $HOST -u $USER -p$PASSWORD -r $dump $database
@@ -388,8 +388,8 @@ dump_pgsql_database() {
388388
echo "Can't connect to pgsql server $HOST" |\
389389
$send_mail -s "$subj" $email
390390
echo "Error: Connection failed"
391-
log_event "$E_DB" "$EVENT"
392-
exit $E_DB
391+
log_event "$E_CONNECT" "$EVENT"
392+
exit $E_CONNECT
393393
fi
394394

395395
pg_dump -h $HOST -U $USER -c --inserts -O -x -i -f $dump $database \
@@ -436,8 +436,8 @@ suspend_mysql_database() {
436436
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
437437
if [ '0' -ne "$?" ]; then
438438
echo "Error: Connection failed"
439-
log_event "$E_DB $EVENT"
440-
exit $E_DB
439+
log_event "$E_CONNECT $EVENT"
440+
exit $E_CONNECT
441441
fi
442442

443443
query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
@@ -462,8 +462,8 @@ suspend_pgsql_database() {
462462
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
463463
if [ '0' -ne "$?" ]; then
464464
echo "Error: Connection failed"
465-
log_event "$E_DB" "$EVENT"
466-
exit $E_DB
465+
log_event "$E_CONNECT" "$EVENT"
466+
exit $E_CONNECT
467467
fi
468468

469469
query="REVOKE ALL PRIVILEGES ON $database FROM $DBUSER"
@@ -484,8 +484,8 @@ unsuspend_mysql_database() {
484484
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
485485
if [ '0' -ne "$?" ]; then
486486
echo "Error: Connection failed"
487-
log_event "$E_DB $EVENT"
488-
exit $E_DB
487+
log_event "$E_CONNECT $EVENT"
488+
exit $E_CONNECT
489489
fi
490490

491491
query="GRANT ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
@@ -510,8 +510,8 @@ unsuspend_pgsql_database() {
510510
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
511511
if [ '0' -ne "$?" ]; then
512512
echo "Error: Connection failed"
513-
log_event "$E_DB" "$EVENT"
514-
exit $E_DB
513+
log_event "$E_CONNECT" "$EVENT"
514+
exit $E_CONNECT
515515
fi
516516

517517
query="GRANT ALL PRIVILEGES ON DATABASE $database TO $DBUSER"
@@ -532,8 +532,8 @@ get_mysql_disk_usage() {
532532
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
533533
if [ '0' -ne "$?" ]; then
534534
echo "Error: Connection failed"
535-
log_event "$E_DB $EVENT"
536-
exit $E_DB
535+
log_event "$E_CONNECT $EVENT"
536+
exit $E_CONNECT
537537
fi
538538

539539
query="SELECT SUM( data_length + index_length ) / 1024 / 1024 \"Size\"
@@ -561,8 +561,8 @@ get_pgsql_disk_usage() {
561561
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
562562
if [ '0' -ne "$?" ]; then
563563
echo "Error: Connection failed"
564-
log_event "$E_DB" "$EVENT"
565-
exit $E_DB
564+
log_event "$E_CONNECT" "$EVENT"
565+
exit $E_CONNECT
566566
fi
567567

568568
query="SELECT pg_database_size('$database');"

‎func/main.sh‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@ E_DISABLED=11
4343
E_PARSING=12
4444
E_DISK=13
4545
E_LA=14
46-
E_FTP=15
47-
E_SSH=16
46+
E_CONNECT=15
47+
E_FTP=16
4848
E_DB=17
4949
E_RRD=18
5050
E_UPDATE=19
@@ -133,7 +133,7 @@ is_package_valid() {
133133
pkg_dir="$VESTA/data/packages"
134134
fi
135135
if [ ! -e "$pkg_dir/$package.pkg" ]; then
136-
echo "Error: package $package not exist"
136+
echo "Error: package $package doesn't exist"
137137
log_event "$E_NOTEXIST $EVENT"
138138
exit $E_NOTEXIST
139139
fi
@@ -209,7 +209,7 @@ is_object_valid() {
209209
fi
210210
fi
211211
if [ -z "$sobject" ]; then
212-
echo "Error: $2 $3 not exist"
212+
echo "Error: $2 $3 doesn't exist"
213213
log_event "$E_NOTEXIST" "$EVENT"
214214
exit $E_NOTEXIST
215215
fi
@@ -261,7 +261,7 @@ is_object_value_exist() {
261261
eval $str
262262
eval value=$4
263263
if [ -z "$value" ] || [ "$value" = 'no' ]; then
264-
echo "Error: ${4//$}=$value (not exist)"
264+
echo "Error: ${4//$}=$value (doesn't exist)"
265265
log_event "$E_NOTEXIST" "$EVENT"
266266
exit $E_NOTEXIST
267267
fi

‎func/rebuild.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -525,8 +525,8 @@ rebuild_mysql_database() {
525525
echo "Database connection to MySQL host $HOST failed" |\
526526
$send_mail -s "$subj" $email
527527
fi
528-
log_event "$E_DB $EVENT"
529-
exit $E_DB
528+
log_event "$E_CONNECT $EVENT"
529+
exit $E_CONNECT
530530
fi
531531

532532
query="CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET"
@@ -568,8 +568,8 @@ rebuild_pgsql_database() {
568568
echo "Database connection to PostgreSQL host $HOST failed" |\
569569
$send_mail -s "$subj" $email
570570
fi
571-
log_event "$E_DB" "$EVENT"
572-
exit $E_DB
571+
log_event "$E_CONNECT" "$EVENT"
572+
exit $E_CONNECT
573573
fi
574574

575575
query="CREATE ROLE $DBUSER"

0 commit comments

Comments
 (0)