github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-14 10:37:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactoring: log_event(), is_format_valid()

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

18
func/db.sh
View file

@ -4,7 +4,7 @@ mysql_connect() {
eval $host_str
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ]; then
echo "Error: mysql config parsing failed"
log_event "$E_PARSING" "$EVENT"
log_event "$E_PARSING" "$ARGUMENTS"
exit $E_PARSING
fi
@ -33,7 +33,7 @@ mysql_connect() {
$send_mail -s "$subj" $email
fi
echo "Error: Connection to $HOST failed"
log_event "$E_CONNECT" "$EVENT"
log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT
fi
}
@ -52,7 +52,7 @@ mysql_dump() {
$send_mail -s "$subj" $email
fi
echo "Error: dump $database failed"
log_event "$E_DB" "$EVENT"
log_event "$E_DB" "$ARGUMENTS"
exit $E_DB
fi
}
@ -64,7 +64,7 @@ psql_connect() {
export PGPASSWORD="$PASSWORD"
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
echo "Error: postgresql config parsing failed"
log_event "$E_PARSING" "$EVENT"
log_event "$E_PARSING" "$ARGUMENTS"
exit $E_PARSING
fi
@ -75,7 +75,7 @@ psql_connect() {
$send_mail -s "$subj" $email
fi
echo "Error: Connection to $HOST failed"
log_event "$E_CONNECT" "$EVENT"
log_event "$E_CONNECT" "$ARGUMENTS"
exit $E_CONNECT
fi
}
@ -93,7 +93,7 @@ psql_dump() {
$send_mail -s "$subj" $email
fi
echo "Error: dump $database failed"
log_event "$E_DB" "$EVENT"
log_event "$E_DB" "$ARGUMENTS"
exit $E_DB
fi
}
@ -137,7 +137,7 @@ is_charset_valid() {
if [ -z "$(echo $CHARSETS | grep -wi $charset )" ]; then
echo "Error: charset $charset not exist"
log_event "$E_NOTEXIST" "$EVENT"
log_event "$E_NOTEXIST" "$ARGUMENTS"
exit $E_NOTEXIST
fi
}
@ -235,7 +235,7 @@ is_dbhost_new() {
check_host=$(grep "HOST='$host'" $VESTA/conf/$type.conf)
if [ ! -z "$check_host" ]; then
echo "Error: db host exist"
log_event "$E_EXISTS" "$EVENT"
log_event "$E_EXISTS" "$ARGUMENTS"
exit $E_EXISTS
fi
fi
@ -345,7 +345,7 @@ is_dbhost_free() {
eval $host_str
if [ 0 -ne "$U_DB_BASES" ]; then
echo "Error: host $HOST is used"
log_event "$E_INUSE" "$EVENT"
log_event "$E_INUSE" "$ARGUMENTS"
exit $E_INUSE
fi
}