Linux
/
obackup
mirror of https://github.com/deajan/obackup.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Missing manual database list detection fix

This commit is contained in:
deajan 2017-01-02 12:01:58 +01:00
parent 085a167442
commit 290821e949
1 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
dev/n_obackup.sh
View File

@ -10,7 +10,7 @@ PROGRAM="obackup"
AUTHOR="(C) 2013-2016 by Orsiris de Jong" AUTHOR="(C) 2013-2016 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr" CONTACT="http://www.netpower.fr/obackup - ozy@netpower.fr"
PROGRAM_VERSION=2.1-dev PROGRAM_VERSION=2.1-dev
PROGRAM_BUILD=2016123101 PROGRAM_BUILD=2017010201
IS_STABLE=no IS_STABLE=no
include #### OFUNCTIONS FULL SUBSET #### include #### OFUNCTIONS FULL SUBSET ####
@ -273,6 +273,7 @@ function ListDatabases {
local dbName local dbName
local dbSize local dbSize
local dbBackup local dbBackup
local missingDatabases=false
local dbArray local dbArray
@ -304,24 +305,28 @@ function ListDatabases {
while read -r name size; do dbName=$name; dbSize=$size; done <<< "$line" while read -r name size; do dbName=$name; dbSize=$size; done <<< "$line"
if [ "$DATABASES_ALL" == "yes" ]; then if [ "$DATABASES_ALL" == "yes" ]; then
dbBackup=1 dbBackup=true
IFS=$PATH_SEPARATOR_CHAR read -r -a dbArray <<< "$DATABASES_ALL_EXCLUDE_LIST" IFS=$PATH_SEPARATOR_CHAR read -r -a dbArray <<< "$DATABASES_ALL_EXCLUDE_LIST"
for j in "${dbArray[@]}"; do for j in "${dbArray[@]}"; do
if [ "$dbName" == "$j" ]; then if [ "$dbName" == "$j" ]; then
dbBackup=0 dbBackup=false
fi fi
done done
else else
dbBackup=0 dbBackup=false
IFS=$PATH_SEPARATOR_CHAR read -r -a dbArray <<< "$DATABASES_LIST" IFS=$PATH_SEPARATOR_CHAR read -r -a dbArray <<< "$DATABASES_LIST"
for j in "${dbArray[@]}"; do for j in "${dbArray[@]}"; do
if [ "$dbName" == "$j" ]; then if [ "$dbName" == "$j" ]; then
dbBackup=1 dbBackup=true
fi fi
done done
if [ $dbBackup == false ]; then
missingDatabases=true
fi
fi fi
if [ $dbBackup -eq 1 ]; then if [ $dbBackup == true ]; then
if [ "$SQL_BACKUP_TASKS" != "" ]; then if [ "$SQL_BACKUP_TASKS" != "" ]; then
SQL_BACKUP_TASKS="$SQL_BACKUP_TASKS $dbName" SQL_BACKUP_TASKS="$SQL_BACKUP_TASKS $dbName"
else else
@ -333,6 +338,15 @@ function ListDatabases {
fi fi
done < "$outputFile" done < "$outputFile"
if [ $missingDatabases == true ]; then
IFS=$PATH_SEPARATOR_CHAR read -r -a dbArray <<< "$DATABASES_LIST"
for i in "${dbArray[@]}"; do
if ! grep "$i" "$outputFile" > /dev/null 2>&1; then
Logger "Missing database [$i]." "CRITICAL"
fi
done
fi
Logger "Database backup list: $SQL_BACKUP_TASKS" "DEBUG" Logger "Database backup list: $SQL_BACKUP_TASKS" "DEBUG"
Logger "Database exclude list: $SQL_EXCLUDED_TASKS" "DEBUG" Logger "Database exclude list: $SQL_EXCLUDED_TASKS" "DEBUG"
else else