lib/capistrano/ops/tasks/storage/remove_old_backups.rake in capistrano-ops-0.2.4 vs lib/capistrano/ops/tasks/storage/remove_old_backups.rake in capistrano-ops-0.2.5

- old
+ new

@@ -4,12 +4,12 @@ namespace :storage do backup_path = Rails.root.join(Rails.env.development? ? 'tmp/backups' : '../../shared/backups').to_s backups_enabled = Rails.env.production? || ENV['BACKUPS_ENABLED'] == 'true' external_backup = Rails.env.production? || ENV['EXTERNAL_BACKUP_ENABLED'] == 'true' - @env_local_no = ENV['NUMBER_OF_LOCAL_BACKUPS'] - @env_external_no = ENV['NUMBER_OF_EXTERNAL_BACKUPS'] + @env_local_no = ENV['NUMBER_OF_LOCAL_BACKUPS'].present? ? ENV['NUMBER_OF_LOCAL_BACKUPS'] : nil + @env_external_no = ENV['NUMBER_OF_EXTERNAL_BACKUPS'].present? ? ENV['NUMBER_OF_EXTERNAL_BACKUPS'] : nil @total_local_backups_no = (@env_local_no || ENV['NUMBER_OF_BACKUPS'] || 7).to_i @total_external_backups_no = (@env_external_no || ENV['NUMBER_OF_BACKUPS'] || 7).to_i desc 'remove old storage backups' task :remove_old_backups do bash_regex = "'storage_.{0,}\.tar.gz'" @@ -33,10 +33,11 @@ "tail -n +#{@total_local_backups_no + 1} ", "awk '{print $9}' ", 'xargs rm -rf' ] - system(commandlist.join(' | ')) + result = system(commandlist.join(' | ')) if @total_local_backups_no.positive? + puts 'remove_old_backups: local cleanup finished' if result if ENV['BACKUP_PROVIDER'].present? && external_backup unless @total_external_backups_no.positive? puts "remove_old_backups: No external cleanup because option '#{if @env_external_no 'NUMBER_OF_EXTERNAL_BACKUPS='