FIX: refactor calling of timed backup deletion

refactor calling of timed backup deletion so it runs regardless of SiteSetting.automatic_backups_enabled value
This commit is contained in:
marstall
2024-01-08 15:41:00 -05:00
committed by GitHub
parent c62d1197b9
commit 3837657449
6 changed files with 38 additions and 17 deletions

View File

@ -51,13 +51,19 @@ module BackupRestore
@backup_filename
ensure
delete_old
delete_prior_to_n_days
clean_up
notify_user
log "Finished!"
publish_completion
end
def delete_prior_to_n_days
return if Rails.env.development?
store.delete_prior_to_n_days
rescue => ex
log "Something went wrong while deleting backups prior to n days....", ex
end
protected
def ensure_no_operation_is_running
@ -359,15 +365,6 @@ module BackupRestore
log "Something went wrong while deleting old backups.", ex
end
def delete_prior_to_n_days
return if Rails.env.development?
log "Deleting backups prior to n days..."
store.delete_prior_to_n_days
rescue => ex
log "Something went wrong while deleting backups prior to n days....", ex
end
def notify_user
return if success && @user.id == Discourse::SYSTEM_USER_ID

View File

@ -131,9 +131,13 @@ module BackupRestore
def unsorted_files
objects = []
s3_helper.list.each do |obj|
objects << create_file_from_object(obj) if obj.key.match?(file_regex)
end
begin
s3_helper.list.each do |obj|
objects << create_file_from_object(obj) if obj.key.match?(file_regex)
end
rescue StandardError
NoMethodError
end #fired when s3_helper.list is nil - wont respond to .nil?
objects
rescue Aws::Errors::ServiceError => e