bryan
/
borgwrapper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix bugs with dump routines

dev
Bryan 2020-11-01 12:59:20 -06:00
parent a67488796b
commit 2fbe90c0cb
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/borgwrapper
View File

@ -33,7 +33,7 @@ error_handler () {
save_package_list () { save_package_list () {
if ! which apt-mark; then if ! which apt-mark; then
return 2 return
fi fi
if [ ! -d "${PACKAGE_LIST_DIRECTORY}" ]; then if [ ! -d "${PACKAGE_LIST_DIRECTORY}" ]; then
@ -45,7 +45,7 @@ save_package_list () {
dump_sql () { dump_sql () {
if ! which mysqldump; then if ! which mysqldump; then
return 2 return
fi fi
if [ ! -d "${MYSQL_DUMP_DIRECTORY}" ] if [ ! -d "${MYSQL_DUMP_DIRECTORY}" ]
@ -53,13 +53,13 @@ dump_sql () {
fi fi
for DB in $(mysql -u 'root' -e 'show databases' -s --skip-column-names); do for DB in $(mysql -u 'root' -e 'show databases' -s --skip-column-names); do
mysqldump --single-transaction -u 'root' "${DB}" > "${MYSQL_DUMP_DIRECTORY}${DB}.sql.bak"; mysqldump --single-transaction -u 'root' "${DB}" > "${MYSQL_DUMP_DIRECTORY}${DB}.sql.bak" || echo "mysqldump error"
done done
} }
dump_mongo () { dump_mongo () {
if ! which mongodump; then if ! which mongodump; then
return 2 return
fi fi
if [ ! -d "${MONGODB_DUMP_DIRECTORY}" ] if [ ! -d "${MONGODB_DUMP_DIRECTORY}" ]
@ -277,11 +277,16 @@ mkdir -p "${LOCKDIR}"
elif [[ ${MODE} == "backup" ]]; then elif [[ ${MODE} == "backup" ]]; then
trap 'exit_backup $?' ERR INT TERM trap 'exit_backup $?' ERR INT TERM
save_package_list save_package_list
echo "saving package list"
dump_mongo dump_mongo
echo "dumping mongo"
dump_sql dump_sql
echo "dumping sql"
borg_backup borg_backup
echo "running borg backup"
borg_prune borg_prune
echo "running borg prune"
exit_backup 0 exit_backup 0
elif [[ ${MODE} == "verify" ]]; then elif [[ ${MODE} == "verify" ]]; then
trap 'exit_verify $?' ERR INT TERM trap 'exit_verify $?' ERR INT TERM