updated error code table

This commit is contained in:
Serghey Rodin 2013-05-24 11:02:58 +03:00
commit 2dce1a5de4
10 changed files with 51 additions and 51 deletions

View file

@ -98,8 +98,8 @@ add_mysql_database() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
@ -134,8 +134,8 @@ add_pgsql_database() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="CREATE ROLE $dbuser WITH LOGIN PASSWORD '$dbpass'"
@ -177,8 +177,8 @@ is_mysql_host_alive() {
mysql -h $host -u $dbuser -p$dbpass -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection to $host failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
}
@ -188,8 +188,8 @@ is_pgsql_host_alive() {
psql -h $host -U $dbuser -c "SELECT VERSION()" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection to $host failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
}
@ -213,8 +213,8 @@ change_mysql_password() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="GRANT ALL ON \`$database\`.* TO \`$DBUSER\`@\`%\`
@ -245,8 +245,8 @@ change_pgsql_password() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="ALTER ROLE $DBUSER WITH LOGIN PASSWORD '$dbpass'"
@ -270,8 +270,8 @@ delete_mysql_database() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="DROP DATABASE \`$database\`"
@ -307,8 +307,8 @@ delete_pgsql_database() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="REVOKE ALL PRIVILEGES ON DATABASE $database FROM $DBUSER"
@ -344,8 +344,8 @@ dump_mysql_database() {
echo "Can't connect to mysql server $HOST" |\
$send_mail -s "$subj" $email
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
mysqldump -h $HOST -u $USER -p$PASSWORD -r $dump $database
@ -388,8 +388,8 @@ dump_pgsql_database() {
echo "Can't connect to pgsql server $HOST" |\
$send_mail -s "$subj" $email
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
pg_dump -h $HOST -U $USER -c --inserts -O -x -i -f $dump $database \
@ -436,8 +436,8 @@ suspend_mysql_database() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="REVOKE ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
@ -462,8 +462,8 @@ suspend_pgsql_database() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="REVOKE ALL PRIVILEGES ON $database FROM $DBUSER"
@ -484,8 +484,8 @@ unsuspend_mysql_database() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="GRANT ALL ON \`$database\`.* FROM \`$DBUSER\`@\`%\`"
@ -510,8 +510,8 @@ unsuspend_pgsql_database() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="GRANT ALL PRIVILEGES ON DATABASE $database TO $DBUSER"
@ -532,8 +532,8 @@ get_mysql_disk_usage() {
mysql -h $HOST -u $USER -p$PASSWORD -e "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="SELECT SUM( data_length + index_length ) / 1024 / 1024 \"Size\"
@ -561,8 +561,8 @@ get_pgsql_disk_usage() {
psql -h $HOST -U $USER -c "$query" > /dev/null 2>&1
if [ '0' -ne "$?" ]; then
echo "Error: Connection failed"
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="SELECT pg_database_size('$database');"

View file

@ -43,8 +43,8 @@ E_DISABLED=11
E_PARSING=12
E_DISK=13
E_LA=14
E_FTP=15
E_SSH=16
E_CONNECT=15
E_FTP=16
E_DB=17
E_RRD=18
E_UPDATE=19
@ -133,7 +133,7 @@ is_package_valid() {
pkg_dir="$VESTA/data/packages"
fi
if [ ! -e "$pkg_dir/$package.pkg" ]; then
echo "Error: package $package not exist"
echo "Error: package $package doesn't exist"
log_event "$E_NOTEXIST $EVENT"
exit $E_NOTEXIST
fi
@ -209,7 +209,7 @@ is_object_valid() {
fi
fi
if [ -z "$sobject" ]; then
echo "Error: $2 $3 not exist"
echo "Error: $2 $3 doesn't exist"
log_event "$E_NOTEXIST" "$EVENT"
exit $E_NOTEXIST
fi
@ -261,7 +261,7 @@ is_object_value_exist() {
eval $str
eval value=$4
if [ -z "$value" ] || [ "$value" = 'no' ]; then
echo "Error: ${4//$}=$value (not exist)"
echo "Error: ${4//$}=$value (doesn't exist)"
log_event "$E_NOTEXIST" "$EVENT"
exit $E_NOTEXIST
fi

View file

@ -525,8 +525,8 @@ rebuild_mysql_database() {
echo "Database connection to MySQL host $HOST failed" |\
$send_mail -s "$subj" $email
fi
log_event "$E_DB $EVENT"
exit $E_DB
log_event "$E_CONNECT $EVENT"
exit $E_CONNECT
fi
query="CREATE DATABASE \`$DB\` CHARACTER SET $CHARSET"
@ -568,8 +568,8 @@ rebuild_pgsql_database() {
echo "Database connection to PostgreSQL host $HOST failed" |\
$send_mail -s "$subj" $email
fi
log_event "$E_DB" "$EVENT"
exit $E_DB
log_event "$E_CONNECT" "$EVENT"
exit $E_CONNECT
fi
query="CREATE ROLE $DBUSER"