summaryrefslogtreecommitdiff
path: root/lib/backup
diff options
context:
space:
mode:
authorDouwe Maan <douwe@gitlab.com>2018-01-16 16:40:20 +0000
committerDouwe Maan <douwe@gitlab.com>2018-01-16 16:40:20 +0000
commitf084525fe4cceee1c6c3d86d5bd3150fa6334e42 (patch)
treee269fcaaa008139e9d77ccc3fd869a901cdf3ce6 /lib/backup
parent86268771e06973cd2f115982b99a1f90f097080a (diff)
parent740d819e8777e70de5827428e711ed5ed81ab177 (diff)
downloadgitlab-ce-f084525fe4cceee1c6c3d86d5bd3150fa6334e42.tar.gz
Merge branch 'print-list-of-available-backups' into 'master'
List backups avilable for restore See merge request gitlab-org/gitlab-ce!16465
Diffstat (limited to 'lib/backup')
-rw-r--r--lib/backup/manager.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 05aa79dc160..f27ce4d2b2b 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -108,7 +108,10 @@ module Backup
$progress.puts "Please make sure that file name ends with #{FILE_NAME_SUFFIX}"
exit 1
elsif backup_file_list.many? && ENV["BACKUP"].nil?
- $progress.puts 'Found more than one backup, please specify which one you want to restore:'
+ $progress.puts 'Found more than one backup:'
+ # print list of available backups
+ $progress.puts " " + available_timestamps.join("\n ")
+ $progress.puts 'Please specify which one you want to restore:'
$progress.puts 'rake gitlab:backup:restore BACKUP=timestamp_of_backup'
exit 1
end
@@ -169,6 +172,10 @@ module Backup
@backup_file_list ||= Dir.glob("*#{FILE_NAME_SUFFIX}")
end
+ def available_timestamps
+ @backup_file_list.map {|item| item.gsub("#{FILE_NAME_SUFFIX}", "")}
+ end
+
def connect_to_remote_directory(connection_settings)
# our settings use string keys, but Fog expects symbols
connection = ::Fog::Storage.new(connection_settings.symbolize_keys)