mirror of
https://github.com/myvesta/vesta
synced 2025-08-21 22:04:01 -07:00
redesigned return codes
This commit is contained in:
Serghey Rodin
parent
2fbabe2de5
commit
593819e10b
24 changed files with 335 additions and 440 deletions
176
func/db.func
176
func/db.func
|
|
@ -5,8 +5,8 @@ is_db_valid() {
|
|||
# Checking result
|
||||
if [ -z "$check_db" ]; then
|
||||
echo "Error: db not added"
|
||||
log_event 'debug' "$E_DB_NOTEXIST $V_EVENT"
|
||||
exit $E_DB_NOTEXIST
|
||||
log_event 'debug' "$E_NOTEXIST $V_EVENT"
|
||||
exit $E_NOTEXIST
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -17,8 +17,8 @@ is_db_new() {
|
|||
# Checking result
|
||||
if [ ! -z "$check_db" ]; then
|
||||
echo "Error: db exist"
|
||||
log_event 'debug' "$E_DB_EXIST $V_EVENT"
|
||||
exit $E_DB_EXIST
|
||||
log_event 'debug' "$E_EXISTS $V_EVENT"
|
||||
exit $E_EXISTS
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -31,8 +31,8 @@ is_db_host_valid() {
|
|||
# Checking result
|
||||
if [ -z "$check_db" ]; then
|
||||
echo "Error: host not added"
|
||||
log_event 'debug' "$E_DBHOST_NOTEXIST $V_EVENT"
|
||||
exit $E_DBHOST_NOTEXIST
|
||||
log_event 'debug' "$E_NOTEXIST $V_EVENT"
|
||||
exit $E_NOTEXIST
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -231,16 +231,16 @@ create_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Adding database & checking result
|
||||
|
|
@ -248,8 +248,8 @@ create_db_mysql() {
|
|||
code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Adding user with password (% will give access to db from any ip)
|
||||
|
|
@ -279,16 +279,16 @@ create_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Adding new role
|
||||
|
|
@ -296,8 +296,8 @@ create_db_pgsql() {
|
|||
code=$?
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Adding database & checking result
|
||||
|
|
@ -320,8 +320,8 @@ is_db_host_new() {
|
|||
check_host=$(grep "HOST='$host'" $V_DB/$type.conf)
|
||||
if [ ! -z "$check_host" ]; then
|
||||
echo "Error: db host exist"
|
||||
log_event 'debug' "$E_DBHOST_EXIST $V_EVENT"
|
||||
exit $E_DBHOST_EXIST
|
||||
log_event 'debug' "$E_EXISTS $V_EVENT"
|
||||
exit $E_EXISTS
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
|
@ -332,8 +332,8 @@ is_mysql_host_alive() {
|
|||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -344,8 +344,8 @@ is_pgsql_host_alive() {
|
|||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -356,8 +356,8 @@ is_db_suspended() {
|
|||
# Checking result
|
||||
if [ ! -z "$check_db" ]; then
|
||||
echo "Error: db suspended"
|
||||
log_event 'debug' "$E_DB_SUSPENDED $V_EVENT"
|
||||
exit $E_DB_SUSPENDED
|
||||
log_event 'debug' "$E_SUSPENDED $V_EVENT"
|
||||
exit $E_SUSPENDED
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -368,8 +368,8 @@ is_db_unsuspended() {
|
|||
# Checking result
|
||||
if [ -z "$check_db" ]; then
|
||||
echo "Error: db unsuspended"
|
||||
log_event 'debug' "$E_DB_UNSUSPENDED $V_EVENT"
|
||||
exit $E_DB_UNSUSPENDED
|
||||
log_event 'debug' "$E_UNSUSPENDED $V_EVENT"
|
||||
exit $E_UNSUSPENDED
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -380,8 +380,8 @@ is_db_user_valid() {
|
|||
# Checking result
|
||||
if [ -z "$check_db" ]; then
|
||||
echo "Error: dbuser not exist"
|
||||
log_event 'debug' "$E_DBUSER_NOTEXIST $V_EVENT"
|
||||
exit $E_DBUSER_NOTEXIST
|
||||
log_event 'debug' "$E_NOTEXIST $V_EVENT"
|
||||
exit $E_NOTEXIST
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -396,16 +396,16 @@ change_db_mysql_password() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Changing user password
|
||||
|
|
@ -430,16 +430,16 @@ change_db_pgsql_password() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
$sql "ALTER ROLE $db_user WITH LOGIN PASSWORD '$db_password'" >/dev/null
|
||||
|
|
@ -474,24 +474,24 @@ del_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Deleting database & checking result
|
||||
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Deleting user
|
||||
|
|
@ -523,16 +523,16 @@ del_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Deleting database & checking result
|
||||
|
|
@ -540,8 +540,8 @@ del_db_pgsql() {
|
|||
$sql "DROP DATABASE $database" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Deleting user
|
||||
|
|
@ -562,8 +562,8 @@ del_db_vesta() {
|
|||
string=$( grep -n "DB='$database'" $conf | cut -f 1 -d : )
|
||||
if [ -z "$string" ]; then
|
||||
echo "Error: parse error"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
sed -i "$string d" $conf
|
||||
}
|
||||
|
|
@ -580,16 +580,16 @@ dump_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Dumping database
|
||||
|
|
@ -613,16 +613,16 @@ dump_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Dumping database
|
||||
|
|
@ -649,8 +649,8 @@ is_db_host_free() {
|
|||
# Checking U_DB_BASES
|
||||
if [ 0 -ne "$U_DB_BASES" ]; then
|
||||
echo "Error: host is used"
|
||||
log_event 'debug' "$E_DBHOST_BUSY $V_EVENT"
|
||||
exit $E_DBHOST_BUSY
|
||||
log_event 'debug' "$E_INUSE $V_EVENT"
|
||||
exit $E_INUSE
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
@ -661,8 +661,8 @@ del_dbhost_vesta() {
|
|||
string=$( grep -n "HOST='$host'" $conf | cut -f 1 -d : )
|
||||
if [ -z "$string" ]; then
|
||||
echo "Error: parse error"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
sed -i "$string d" $conf
|
||||
}
|
||||
|
|
@ -709,16 +709,16 @@ suspend_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Suspending user
|
||||
|
|
@ -739,16 +739,16 @@ suspend_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Suspending user
|
||||
|
|
@ -767,16 +767,16 @@ unsuspend_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Unsuspending user
|
||||
|
|
@ -797,16 +797,16 @@ unsuspend_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Unsuspending user
|
||||
|
|
@ -840,16 +840,16 @@ get_disk_db_mysql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $PORT ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1; code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Deleting database & checking result
|
||||
|
|
@ -885,16 +885,16 @@ get_disk_db_pgsql() {
|
|||
# Checking empty vars
|
||||
if [ -z $HOST ] || [ -z $USER ] || [ -z $PASSWORD ] || [ -z $TPL ]; then
|
||||
echo "Error: config is broken"
|
||||
log_event 'debug' "$E_PARSE_ERROR $V_EVENT"
|
||||
exit $E_PARSE_ERROR
|
||||
log_event 'debug' "$E_PARSING $V_EVENT"
|
||||
exit $E_PARSING
|
||||
fi
|
||||
|
||||
# Checking connection
|
||||
$sql "SELECT VERSION()" >/dev/null 2>&1;code="$?"
|
||||
if [ '0' -ne "$code" ]; then
|
||||
echo "Error: Connect failed"
|
||||
log_event 'debug' "$E_DBHOST_UNAVAILABLE $V_EVENT"
|
||||
exit $E_DBHOST_UNAVAILABLE
|
||||
log_event 'debug' "$E_DB $V_EVENT"
|
||||
exit $E_DB
|
||||
fi
|
||||
|
||||
# Raw query
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue