From 7c32879e80d3155ebe2515a83360dd3e190a6a91 Mon Sep 17 00:00:00 2001 From: Krzysztof Dajka Date: Tue, 22 Jul 2025 16:56:53 +0200 Subject: [PATCH] fix: exitcode masking db errors --- install/assets/functions/10-db-backup | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/install/assets/functions/10-db-backup b/install/assets/functions/10-db-backup index 30bd933..1891fc7 100644 --- a/install/assets/functions/10-db-backup +++ b/install/assets/functions/10-db-backup @@ -737,7 +737,7 @@ backup_mysql() { write_log notice "Dumping MySQL/MariaDB database: '${db}' ${compression_string}" if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --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_backup_opts} $db | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exitcode=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi check_exit_code backup "${backup_job_filename}" timer backup finish @@ -758,7 +758,7 @@ backup_mysql() { write_log notice "Dumping all MySQL / MariaDB databases: '$(echo ${db_names} | xargs | tr ' ' ',')' ${compression_string}" if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug on; fi run_as_user ${play_fair} ${_mysql_prefix}${_mysql_bin_prefix}dump --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_backup_opts} --databases $(echo ${db_names} | xargs) | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exitcode=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_MYSQL}" ; then debug off; fi check_exit_code backup "${backup_job_filename}" timer backup finish @@ -781,7 +781,7 @@ backup_pgsql() { print_notice "Dumping PostgresSQL globals: with 'pg_dumpall -g' ${compression_string}" if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi 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_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exitcode=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi check_exit_code "${backup_job_filename}" timer backup finish @@ -830,7 +830,7 @@ backup_pgsql() { write_log notice "Dumping PostgresSQL database: '${db}' ${compression_string}" if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug on; fi 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_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exitcode=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi check_exit_code backup "${backup_job_filename}" timer backup finish @@ -864,7 +864,7 @@ backup_pgsql() { pgexclude_arg=$(echo ${pgexclude_arg} --exclude-database=${x_db_name}) done 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_backup_opts} | ${compress_cmd} | run_as_user tee "${temporary_directory}"/"${backup_job_filename}" > /dev/null - exit_code=$? + exitcode=$((PIPESTATUS[0] + PIPESTATUS[1] + PIPESTATUS[2])) if var_true "${DEBUG_BACKUP_PGSQL}" ; then debug off; fi check_exit_code backup "${backup_job_filename}" timer backup finish