github/myvesta
1
0
Fork 0
mirror of https://github.com/myvesta/vesta synced 2025-08-21 13:54:28 -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-24 16:33:24 +03:00
commit 5d30b67fb1
6 changed files with 344 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

11
func/db.sh
View file

@ -30,7 +30,7 @@ mysql_connect() {
if [ '0' -ne "$?" ]; then
if [ "$notify" != 'no' ]; then
echo -e "Can't connect to MySQL $HOST\n$(cat $err)" |\
$send_mail -s "$subj" $email
$SENDMAIL -s "$subj" $email
fi
echo "Error: Connection to $HOST failed"
log_event "$E_CONNECT" "$ARGUMENTS"
@ -49,7 +49,7 @@ mysql_dump() {
rm -rf $tmpdir
if [ "$notify" != 'no' ]; then
echo -e "Can't dump database $database\n$(cat $err)" |\
$send_mail -s "$subj" $email
$SENDMAIL -s "$subj" $email
fi
echo "Error: dump $database failed"
log_event "$E_DB" "$ARGUMENTS"
@ -72,7 +72,7 @@ psql_connect() {
if [ '0' -ne "$?" ]; then
if [ "$notify" != 'no' ]; then
echo -e "Can't connect to PostgreSQL $HOST\n$(cat /tmp/e.psql)" |\
$send_mail -s "$subj" $email
$SENDMAIL -s "$subj" $email
fi
echo "Error: Connection to $HOST failed"
log_event "$E_CONNECT" "$ARGUMENTS"
@ -90,7 +90,7 @@ psql_dump() {
rm -rf $tmpdir
if [ "$notify" != 'no' ]; then
echo -e "Can't dump database $database\n$(cat /tmp/e.psql)" |\
$send_mail -s "$subj" $email
$SENDMAIL -s "$subj" $email
fi
echo "Error: dump $database failed"
log_event "$E_DB" "$ARGUMENTS"
@ -243,8 +243,7 @@ is_dbhost_new() {
# Get database values
get_database_values() {
db_str=$(grep "DB='$database'" $USER_DATA/db.conf)
eval $db_str
eval $(grep "DB='$database'" $USER_DATA/db.conf)
}
# Change MySQL database password