Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug fix for cronjob datetime & cleanup #281 #284

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bug fix for cronjob datetime & cleanup #281 #284

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6fcd388
Fix bug on time_wait calculation
benvia Nov 19, 2023
ab3c523
Fix backup cleanup #281
benvia Nov 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions install/assets/functions/10-db-backup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1025,7 +1025,7 @@ cleanup_old_data() {
if var_true "${DEBUG_CLEANUP_OLD_DATA}" ; then debug on; fi
if [ -n "${backup_job_cleanup_time}" ]; then
if [ "${master_exit_code}" != 1 ]; then
case "${backup_job_backup_location,,}" in
case "${backup_job_backup_location}" in
"blobxfer" )
write_log info "Cleaning up old backups on filesystem"
run_as_user mkdir -p "${backup_job_filesystem_path}"
Expand Down Expand Up @@ -1989,8 +1989,7 @@ timer() {
print_debug "[timer] [datetime] Difference in seconds: ${time_wait}"

if (( ${time_wait} < 0 )); then
time_wait=$(( (${time_wait} + (${backup_job_backup_interval} - 1)) / (${backup_job_backup_interval} * 60) ))
time_wait=$(( ${time_wait} * -1 ))
time_wait=$(( ${backup_job_backup_interval} * 60 - ${time_wait} * -1 % (${backup_job_backup_interval} * 60) ))
print_debug "[timer] [datetime] Difference in seconds (rounded) time_wait is in the past : ${time_wait}"
fi

Expand Down