Skip to content

Commit 89e6956

Browse files
tiredofittiredofit
committed
Adjust debug statements
1 parent 089687d commit 89e6956

File tree

1 file changed

+34
-16
lines changed

1 file changed

+34
-16
lines changed

‎install/assets/functions/10-db-backup

Lines changed: 34 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -378,27 +378,26 @@ bootstrap_variables() {
378378
}
379379

380380
backup_couch() {
381-
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug on; fi
382381
prepare_dbbackup
383382
backup_job_filename=couch_${backup_job_db_name}_${backup_job_db_host#*//}_${now}.txt
384383
backup_job_filename_base=couch_${backup_job_db_name}_${backup_job_db_host#*//}
385384
compression
386385
pre_dbbackup ${backup_job_db_name}
387386
write_log notice "Dumping CouchDB database: '${backup_job_db_name}' ${compression_string}"
387+
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug on; fi
388388
run_as_user curl -sSL -X GET ${backup_job_db_host}:${backup_job_db_port}/${backup_job_db_name}/_all_docs?include_docs=true | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
389389
exit_code=$?
390+
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug off; fi
390391
check_exit_code backup "${backup_job_filename}"
391392
timer backup finish
392393
file_encryption
393394
generate_checksum
394395
move_dbbackup
395396
check_exit_code move "${backup_job_filename}"
396397
post_dbbackup ${backup_job_db_name}
397-
if var_true "${DEBUG_BACKUP_COUCH}" ; then debug off; fi
398398
}
399399

400400
backup_influx() {
401-
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug on; fi
402401
if [ "${backup_job_db_name,,}" = "all" ] ; then
403402
write_log debug "Preparing to back up everything"
404403
db_names=justbackupeverything
@@ -416,13 +415,15 @@ backup_influx() {
416415
compression
417416
pre_dbbackup "${db}"
418417
write_log notice "Dumping Influx database: '${db}'"
418+
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug on; fi
419419
run_as_user influxd backup ${influx_compression} ${bucket} -portable -host ${backup_job_db_host}:${backup_job_db_port} ${backup_job_extra_opts} ${backup_job_extra_dump_opts} "${TEMP_PATH}"/"${backup_job_filename_dir}"
420420
exit_code=$?
421421
check_exit_code backup "${backup_job_filename_dir}"
422422
write_log notice "Creating archive file of '${backup_job_filename_dir}' with tar ${compression_string}"
423423
run_as_user tar cf - "${TEMP_PATH}"/"${backup_job_filename_dir}" | ${dir_compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename_dir}".tar"${extension}" > /dev/null
424424
backup_job_filename=influx_${db}_${backup_job_db_host#*//}_${now}.tar${extension}
425425
backup_job_filename_base=influx_${db}_${backup_job_db_host#*//}
426+
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug off; fi
426427
timer backup finish
427428
file_encryption
428429
generate_checksum
@@ -440,12 +441,14 @@ backup_influx() {
440441
compression
441442
pre_dbbackup "${db}"
442443
write_log notice "Dumping Influx2 database: '${db}'"
444+
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug on; fi
443445
run_as_user influx backup --org ${backup_job_db_user} ${bucket} --host ${backup_job_db_host}:${backup_job_db_port} --token ${backup_job_db_pass} ${backup_job_extra_opts} ${backup_job_extra_dump_opts} --compression none "${TEMP_PATH}"/"${backup_job_filename_dir}"
444446
exit_code=$?
445447
check_exit_code backup "${backup_job_filename_dir}"
446448
create_archive
447449
backup_job_filename=influx2_${db}_${backup_job_db_host#*//}_${now}.tar${extension}
448450
backup_job_filename_base=influx2_${db}_${backup_job_db_host#*//}
451+
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug off; fi
449452
timer backup finish
450453
file_encryption
451454
generate_checksum
@@ -455,11 +458,9 @@ backup_influx() {
455458
done
456459
;;
457460
esac
458-
if var_true "${DEBUG_BACKUP_INFLUX}" ; then debug off; fi
459461
}
460462

461463
backup_mongo() {
462-
if var_true "${DEBUG_BACKUP_MONGO}" ; then debug on; fi
463464
prepare_dbbackup
464465
if [ "${backup_job_compression,,}" = "none" ] ; then
465466
backup_job_filename=${dbtype}_${backup_job_db_name,,}_${backup_job_db_host,,}_${now}.archive
@@ -477,8 +478,10 @@ backup_mongo() {
477478
fi
478479
pre_dbbackup "${backup_job_db_name}"
479480
write_log notice "Dumping MongoDB database: '${DB_NAME}' ${compression_string}"
481+
if var_true "${DEBUG_BACKUP_MONGO}" ; then debug on; fi
480482
silent run_as_user ${play_fair} mongodump --archive=${TEMP_PATH}/${backup_job_filename} ${mongo_compression} ${mongo_backup_parameter}
481483
exit_code=$?
484+
if var_true "${DEBUG_BACKUP_MONGO}" ; then debug off; fi
482485
check_exit_code backup "${backup_job_filename}"
483486
timer backup finish
484487
file_encryption
@@ -490,16 +493,17 @@ backup_mongo() {
490493
}
491494

492495
backup_mssql() {
493-
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug on; fi
494496
case "${backup_job_mssql_mode,,}" in
495497
db|database )
496498
prepare_dbbackup
497499
backup_job_filename=mssql_${backup_job_db_name,,}_${backup_job_db_host,,}_${now}.bak
498500
backup_job_filename_base=mssql_${backup_job_db_name,,}_${backup_job_db_host,,}
499501
pre_dbbackup "${backup_job_db_name}"
500502
write_log notice "Dumping MSSQL database: '${DB_NAME}'"
503+
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug on; fi
501504
silent run_as_user ${play_fair} /opt/mssql-tools18/bin/sqlcmd -C -S ${backup_job_db_host}\,${backup_job_db_port} -U ${backup_job_db_user} -P ${backup_job_db_pass} -Q "BACKUP DATABASE [${backup_job_db_name}] TO DISK = N'${TEMP_PATH}/${backup_job_filename}' WITH NOFORMAT, NOINIT, NAME = '${backup_job_db_name}-full', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
502505
exit_code=$?
506+
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug off; fi
503507
backup_job_filename_original=${backup_job_filename}
504508
compression
505509
pre_dbbackup all
@@ -518,8 +522,10 @@ backup_mssql() {
518522
backup_job_filename_base=mssql_${backup_job_db_name,,}_trn_${backup_job_db_host,,}
519523
pre_dbbackup "${backup_job_db_name}"
520524
write_log notice "Dumping MSSQL database: '${DB_NAME}'"
525+
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug on; fi
521526
silent run_as_user ${play_fair} /opt/mssql-tools18/bin/sqlcmd -C -S ${backup_job_db_host}\,${backup_job_db_port} -U ${backup_job_db_user} -P ${backup_job_db_pass} -Q "BACKUP LOG [${backup_job_db_name}] TO DISK = N'${TEMP_PATH}/${backup_job_filename}' WITH NOFORMAT, NOINIT, NAME = '${backup_job_db_name}-log', SKIP, NOREWIND, NOUNLOAD, STATS = 10"
522527
exit_code=$?
528+
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug off; fi
523529
backup_job_filename_original=${backup_job_filename}
524530
compression
525531
pre_dbbackup all
@@ -533,11 +539,10 @@ backup_mssql() {
533539
post_dbbackup "${backup_job_db_name}"
534540
;;
535541
esac
536-
if var_true "${DEBUG_BACKUP_MSSQL}" ; then debug off; fi
537542
}
538543

539544
backup_mysql() {
540-
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
545+
541546
if var_true "${backup_job_mysql_events}" ; then
542547
events="--events"
543548
fi
@@ -572,8 +577,10 @@ backup_mysql() {
572577
compression
573578
pre_dbbackup "${db}"
574579
write_log notice "Dumping MySQL/MariaDB database: '${db}' ${compression_string}"
580+
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
575581
run_as_user ${play_fair} mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_dump_opts} $db | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
576582
exit_code=$?
583+
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
577584
check_exit_code backup "${backup_job_filename}"
578585
timer backup finish
579586
file_encryption
@@ -590,8 +597,10 @@ backup_mysql() {
590597
compression
591598
pre_dbbackup all
592599
write_log notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"
600+
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi
593601
run_as_user ${play_fair} mysqldump --max-allowed-packet=${backup_job_mysql_max_allowed_packet} -h ${backup_job_db_host} -P ${backup_job_db_port} -u${backup_job_db_user} ${events} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${backup_job_extra_opts} ${backup_job_extra_dump_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
594602
exit_code=$?
603+
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
595604
check_exit_code backup "${backup_job_filename}"
596605
timer backup finish
597606
file_encryption
@@ -600,19 +609,19 @@ backup_mysql() {
600609
check_exit_code move "${backup_job_filename}"
601610
post_dbbackup all
602611
fi
603-
if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi
604612
}
605613

606614
backup_pgsql() {
607-
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
608615
backup_pgsql_globals() {
609616
prepare_dbbackup
610617
backup_job_filename=pgsql_globals_${backup_job_db_host,,}_${now}.sql
611618
compression
612619
pre_dbbackup "globals"
613620
print_notice "Dumping PostgresSQL globals: with 'pg_dumpall -g' ${compression_string}"
621+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
614622
run_as_user ${play_fair} pg_dumpall -h "${backup_job_db_host}" -U "${backup_job_db_user}" -p "${backup_job_db_port}" -g ${backup_job_extra_opts} ${backup_job_extra_dump_opts} | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
615623
exit_code=$?
624+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
616625
check_exit_code "${backup_job_filename}"
617626
timer backup finish
618627
file_encryption
@@ -656,8 +665,10 @@ backup_pgsql() {
656665
compression
657666
pre_dbbackup "${db}"
658667
write_log notice "Dumping PostgresSQL database: '${db}' ${compression_string}"
668+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
659669
run_as_user ${play_fair} pg_dump -h "${backup_job_db_host}" -p "${backup_job_db_port}" -U "${backup_job_db_user}" $db ${backup_job_extra_opts} ${backup_job_extra_dump_opts} | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
660670
exit_code=$?
671+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
661672
check_exit_code backup "${backup_job_filename}"
662673
timer backup finish
663674
file_encryption
@@ -683,8 +694,10 @@ backup_pgsql() {
683694
for x_db_name in ${tmp_db_names} ; do
684695
pgexclude_arg=$(echo ${pgexclude_arg} --exclude-database=${x_db_name})
685696
done
697+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
686698
run_as_user ${play_fair} pg_dumpall -h ${backup_job_db_host} -p ${backup_job_db_port} -U ${backup_job_db_user} ${pgexclude_arg} ${backup_job_extra_opts} ${backup_job_extra_dump_opts} | ${compress_cmd} | run_as_user tee "${TEMP_PATH}"/"${backup_job_filename}" > /dev/null
687699
exit_code=$?
700+
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi
688701
check_exit_code backup "${backup_job_filename}"
689702
timer backup finish
690703
file_encryption
@@ -694,15 +707,14 @@ backup_pgsql() {
694707
post_dbbackup all
695708
if var_true "${_postgres_backup_globals}" ; then backup_pgsql_globals; fi
696709
fi
697-
if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi
698710
}
699711

700712
backup_redis() {
701-
if var_true "${DEBUG_BACKUP_REDIS}" ; then debug on; fi
702713
prepare_dbbackup
703714
write_log notice "Dumping Redis - Flushing Redis Cache First"
704715
backup_job_filename=redis_all_${backup_job_db_host,,}_${now}.rdb
705716
backup_job_filename_base=redis_${backup_job_db_host,,}
717+
if var_true "${DEBUG_BACKUP_REDIS}" ; then debug on; fi
706718
echo bgsave | silent run_as_user ${play_fair} redis-cli -h ${backup_job_db_host} -p ${backup_job_db_port} ${REDIS_PASS_STR} --rdb ${TEMP_PATH}/${backup_job_filename} ${backup_job_extra_opts} ${backup_job_extra_dump_opts}
707719
sleep 10
708720
try=5
@@ -723,17 +735,16 @@ backup_redis() {
723735
pre_dbbackup all
724736
run_as_user ${compress_cmd} "${TEMP_PATH}/${backup_job_filename_original}"
725737
timer backup finish
738+
if var_true "${DEBUG_BACKUP_REDIS}" ; then debug on; fi
726739
check_exit_code backup "${backup_job_filename}"
727740
file_encryption
728741
generate_checksum
729742
move_dbbackup
730743
check_exit_code move "${backup_job_filename}"
731744
post_dbbackup all
732-
if var_true "${DEBUG_BACKUP_REDIS}" ; then debug off; fi
733745
}
734746

735747
backup_sqlite3() {
736-
if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug on; fi
737748
prepare_dbbackup
738749
db=$(basename "${backup_job_db_host}")
739750
db="${db%.*}"
@@ -742,17 +753,18 @@ backup_sqlite3() {
742753
compression
743754
pre_dbbackup "${db}"
744755
write_log notice "Dumping sqlite3 database: '${backup_job_db_host}' ${compression_string}"
756+
if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug on; fi
745757
silent run_as_user ${play_fair} sqlite3 "${backup_job_db_host}" ".backup '${TEMP_PATH}/backup.sqlite3'"
746758
exit_code=$?
747759
check_exit_code backup "${backup_job_filename}"
748760
run_as_user ${play_fair} cat "${TEMP_PATH}"/backup.sqlite3 | ${dir_compress_cmd} | run_as_user tee "${TEMP_PATH}/${backup_job_filename}" > /dev/null
749761
timer backup finish
762+
if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug off; fi
750763
file_encryption
751764
generate_checksum
752765
move_dbbackup
753766
check_exit_code move "${backup_job_filename}"
754767
post_dbbackup "${db}"
755-
if var_true "${DEBUG_BACKUP_SQLITE3}" ; then debug off; fi
756768
}
757769

758770
check_availability() {
@@ -1085,10 +1097,16 @@ debug() {
10851097
case "${1}" in
10861098
off)
10871099
DEBUG_MODE=${OLD_DEBUG_MODE}
1100+
if var_true "${DEBUG_MODE}" ; then
1101+
set -x
1102+
else
1103+
set +x
1104+
fi
1105+
10881106
;;
10891107
on)
10901108
OLD_DEBUG_MODE=${DEBUG_MODE}
1091-
DEBUG_MODE=TRUE
1109+
set -x
10921110
;;
10931111
esac
10941112
}

0 commit comments

Comments
 (0)