From 10e7debc6549f46eeedf96db7e5c29027ba3f868 Mon Sep 17 00:00:00 2001
From: "dave@tiredofit.ca" <dave@tiredofit.ca>
Date: Tue, 18 Jul 2023 07:26:59 -0700
Subject: [PATCH] Release 3.9.7 - See CHANGELOG.md

---
 CHANGELOG.md                          |  6 ++++++
 install/assets/functions/10-db-backup | 17 +++--------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bb11a28..0f69a5e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 3.9.7 2023-07-18 <dave at tiredofit dot ca>
+
+   ### Changed
+      - Cleanup check_exit_code parameter and reduce duplicate output
+
+
 ## 3.9.6 2023-06-16 <dave at tiredofit dot ca>
 
    ### Changed
diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup
index 12494a2..c1e1d06 100644
--- a/install/assets/functions/10-db-backup
+++ b/install/assets/functions/10-db-backup
@@ -216,7 +216,7 @@ backup_mongo() {
     print_notice "Dumping MongoDB database: '${DB_NAME}' ${compression_string}"
     silent mongodump --archive=${TEMP_LOCATION}/${target} ${mongo_compression} ${mongo_backup_parameter}
     exit_code=$?
-    check_exit_code $target
+    check_exit_code backup $target
     generate_checksum
     move_dbbackup
     check_exit_code move $target
@@ -289,7 +289,7 @@ backup_mysql() {
         print_notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}"
         mysqldump --max-allowed-packet=${MYSQL_MAX_ALLOWED_PACKET} -h ${DB_HOST} -P ${DB_PORT} -u${DB_USER} ${single_transaction} ${stored_procedures} ${mysql_tls_args} ${EXTRA_OPTS} --databases $(echo ${db_names} | xargs) | $compress_cmd > "${TEMP_LOCATION}"/"${target}"
         exit_code=$?
-        check_exit_code $target
+        check_exit_code backup $target
         generate_checksum
         move_dbbackup
         check_exit_code move $target
@@ -531,23 +531,12 @@ check_exit_code() {
                     print_debug "Moving of backup '${2}' completed successfully"
                 ;;
                 * )
-                    print_error "Moving of backup '${1}' reported errors"
+                    print_error "Moving of backup '${2}' reported errors"
                     master_exit_code=1
                 ;;
             esac
         ;;
     esac
-
-
-    case "${exit_code}" in
-        0 )
-            print_info "DB Backup of '${1}' completed successfully"
-        ;;
-        * )
-            print_error "DB Backup of '${1}' reported errors"
-            master_exit_code=1
-        ;;
-    esac
 }
 
 cleanup_old_data() {