Skip to content

Commit 593819e

Browse files
serghey-rodinserghey-rodin
committed
redesigned return codes
1 parent 2fbabe2 commit 593819e

24 files changed

+335
-440
lines changed

‎bin/v_add_sys_user‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ is_user_free() {
2525
# Checking result
2626
if [ ! -z "$check_sysuser" ] || [ -e "$V_USERS/$user" ]; then
2727
echo "Error: user $user exist"
28-
log_event 'debug' "$E_USER_EXIST $V_EVENT"
29-
exit $E_USER_EXIST
28+
log_event 'debug' "$E_EXISTS $V_EVENT"
29+
exit $E_EXISTS
3030
fi
3131
}
3232

‎bin/v_backup_sys_user‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ while [ "$la" -ge "$V_BACKUP_LA_LIMIT" ]; do
4646

4747
if [ "$i" -ge "15" ]; then
4848
echo "Error: LA is too high"
49-
log_event 'debug' "$E_LOAD_AVERAGE $V_EVENT"
50-
exit $E_LOAD_AVERAGE
49+
log_event 'debug' "$E_LA $V_EVENT"
50+
exit $E_LA
5151
fi
5252

5353
(( ++i))
@@ -367,8 +367,8 @@ local_backup(){
367367
disk_usage=$(df $V_BACKUP | awk '{print $5}'|tail -n1|cut -f 1 -d '%')
368368
if [ "$disk_usage" -ge "$V_BACKUP_DISK_LIMIT" ]; then
369369
echo "Error: Not enough disk space"
370-
log_event 'debug' "$E_DISK_SPACE $V_EVENT"
371-
exit $E_DISK_SPACE
370+
log_event 'debug' "$E_DISK $V_EVENT"
371+
exit $E_DISK
372372
fi
373373

374374
# Creating final tarball
@@ -402,8 +402,8 @@ ftp_backup(){
402402
if [ -z "$HOST" ] || [ -z "$USERNAME" ] || [ -z "$PASSWORD" ] ||\
403403
[ -z "$BPATH" ]; then
404404
echo "Error: Parsing error"
405-
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
406-
exit $E_PARSE_ERROR
405+
log_event 'debug' "$E_PARSING $V_EVENT"
406+
exit $E_PARSING
407407
fi
408408

409409
# Debug info
@@ -417,8 +417,8 @@ ftp_backup(){
417417
rm $ftmpdir"
418418
if [ ! -z "$(ftpc "$command")" ] ; then
419419
echo "Error: FTP error"
420-
log_event 'debug' "$E_FTP_ERROR $V_EVENT"
421-
exit $E_FTP_ERROR
420+
log_event 'debug' "$E_FTP $V_EVENT"
421+
exit $E_FTP
422422
fi
423423

424424
# Checking retention

‎bin/v_change_sys_ip_status‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ is_sys_ip_valid
3333
current_status=$(get_sys_ip_value '$STATUS')
3434
if [ "$ip_status" = "$current_status" ]; then
3535
echo "Error: status is already set"
36-
log_event 'debug' "$E_VALUE_EXIST $V_EVENT"
37-
exit $E_VALUE_EXIST
36+
log_event 'debug' "$E_EXISTS $V_EVENT"
37+
exit $E_EXISTS
3838
fi
3939

4040
# Parsing current ip usage
@@ -45,8 +45,8 @@ ip_owner=$(get_sys_ip_value '$OWNER')
4545
# Checking condition
4646
if [ "$web_domains" -ne '0' ] && [ "$sys_user" != "$ip_owner" ]; then
4747
echo "Error: ip is used"
48-
log_event 'debug' "$E_IP_USED $V_EVENT"
49-
exit $E_IP_USED
48+
log_event 'debug' "$E_INUSE $V_EVENT"
49+
exit $E_INUSE
5050
fi
5151

5252

‎bin/v_change_sys_user_package‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,8 @@ is_package_avalable() {
4747
[ "$DISK_QUOTA" -lt "$U_DISK" ] ||\
4848
[ "$BANDWIDTH" -lt "$U_BANDWIDTH" ]; then
4949
echo "Error: Upgrade package"
50-
log_event 'debug' "$E_PKG_UPGRADE $v_log"
51-
exit $E_PKG_UPGRADE
50+
log_event 'debug' "$E_LIMIT $v_log"
51+
exit $E_LIMIT
5252
fi
5353
}
5454

‎bin/v_del_web_domain_alias‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ get_web_domain_values
4949
check_alias=$(echo ${ALIAS//,/ }|grep -w "$dom_alias")
5050
if [ -z "$check_alias" ]; then
5151
echo "Error: alias not exist"
52-
log_event 'debug' "$E_DOM_NOTEXIST $V_EVENT"
53-
exit $E_DOM_NOTEXIST
52+
log_event 'debug' "$E_NOTEXIST $V_EVENT"
53+
exit $E_NOTEXIST
5454
fi
5555

5656
#----------------------------------------------------------#

‎bin/v_upd_sys_rrd_ftp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ case $period in
2424
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
2525
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
2626
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
27-
*) exit $E_RRD_FAILED ;;
27+
*) exit $E_RRD ;;
2828
esac
2929

3030
# Checking directory
@@ -89,7 +89,7 @@ rrdtool graph $V_RRD/ftp/$period-ftp.png \
8989
#----------------------------------------------------------#
9090

9191
if [ "$result" -ne 0 ]; then
92-
exit $E_RRD_FAILED
92+
exit $E_RRD
9393
fi
9494

9595
exit

‎bin/v_upd_sys_rrd_httpd‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ case $period in
2323
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
2424
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
2525
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
26-
*) exit $E_RRD_FAILED ;;
26+
*) exit $E_RRD ;;
2727
esac
2828

2929

@@ -94,7 +94,7 @@ rrdtool graph $V_RRD/web/$period-httpd.png \
9494
#----------------------------------------------------------#
9595

9696
if [ "$result" -ne 0 ]; then
97-
exit $E_RRD_FAILED
97+
exit $E_RRD
9898
fi
9999

100100
exit

‎bin/v_upd_sys_rrd_la‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ case $period in
2323
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
2424
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
2525
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
26-
*) exit $E_RRD_FAILED ;;
26+
*) exit $E_RRD ;;
2727
esac
2828

2929
# Checking directory
@@ -94,7 +94,7 @@ rrdtool graph $V_RRD/la/$period-la.png \
9494
#----------------------------------------------------------#
9595

9696
if [ "$result" -ne 0 ]; then
97-
exit $E_RRD_FAILED
97+
exit $E_RRD
9898
fi
9999

100100
exit

‎bin/v_upd_sys_rrd_mem‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ case $period in
2323
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
2424
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
2525
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
26-
*) exit $E_RRD_FAILED ;;
26+
*) exit $E_RRD ;;
2727
esac
2828

2929
# Checking directory
@@ -94,7 +94,7 @@ rrdtool graph $V_RRD/mem/$period-mem.png \
9494
#----------------------------------------------------------#
9595

9696
if [ "$result" -ne 0 ]; then
97-
exit $E_RRD_FAILED
97+
exit $E_RRD
9898
fi
9999

100100
exit

‎bin/v_upd_sys_rrd_mysql‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ case $period in
2424
weekly) start='-7d'; end='now'; grid='HOUR:8:DAY:1:DAY:1:0:%a %d';;
2525
monthly) start='-1m'; end='now'; grid='WEEK:1:WEEK:1:WEEK:1:0:%b %d';;
2626
yearly) start='-1y'; end='now'; grid='MONTH:1:YEAR:1:MONTH:2:2419200:%b';;
27-
*) exit $E_RRD_FAILED ;;
27+
*) exit $E_RRD ;;
2828
esac
2929

3030
# Checking directory
@@ -76,8 +76,8 @@ for host in $hosts; do
7676
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]
7777
then
7878
echo "Error: config is broken"
79-
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
80-
exit $E_PARSE_ERROR
79+
log_event 'debug' "$E_PARSING $V_EVENT"
80+
exit $E_PARSING
8181
fi
8282

8383
# Parsing data
@@ -126,7 +126,7 @@ for host in $hosts; do
126126
GPRINT:s:'MAX:Max\:''%8.0lf\j' >/dev/null 2>/dev/null; result=$?
127127

128128
if [ "$result" -ne 0 ]; then
129-
exit $E_RRD_FAILED
129+
exit $E_RRD
130130
fi
131131

132132
done

0 commit comments

Comments
 (0)