refactoring: log_event(), is_format_valid()

This commit is contained in:
Serghey Rodin 2016-06-09 16:31:56 +03:00
commit e05dca61a6
211 changed files with 756 additions and 1091 deletions

View file

@ -25,9 +25,9 @@ source $VESTA/conf/vesta.conf
# Verifications #
#----------------------------------------------------------#
check_args '2' "$#" 'USER DOMAIN [IP] [RESTART]'
validate_format 'user' 'domain'
is_format_valid 'user' 'domain'
if [ ! -z "$ip" ] ; then
validate_format 'ip'
is_format_valid 'ip'
fi
is_object_valid 'user' 'USER' "$user"
is_object_unsuspended 'user' 'USER' "$user"
@ -42,7 +42,7 @@ if [ -z "$ip" ]; then
ip=$(get_user_ip $user)
if [ -z "$ip" ]; then
echo "Error: no avaiable IP address"
log_event "$E_NOTEXIST" "$EVENT"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
fi