summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorValery Sizov <vsv2711@gmail.com>2015-05-07 12:47:35 +0300
committerValery Sizov <vsv2711@gmail.com>2015-05-07 12:47:35 +0300
commitc3a7f2820f6ef1612dbc0cf9e3d0926aa253033a (patch)
treebe4ba0c733347328a64a7161c160ed4034d2fa6b
parent81f32d75ebb28418a103c6140fbf13e4fb02ae99 (diff)
downloadgitlab-ci-c3a7f2820f6ef1612dbc0cf9e3d0926aa253033a.tar.gz
using gzip for backup
-rw-r--r--lib/backup/manager.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/lib/backup/manager.rb b/lib/backup/manager.rb
index 59a43ba..dc5ac75 100644
--- a/lib/backup/manager.rb
+++ b/lib/backup/manager.rb
@@ -7,7 +7,7 @@ module Backup
s[:backup_created_at] = Time.now
s[:gitlab_version] = GitlabCi::VERSION
s[:tar_version] = tar_version
- tar_file = "#{s[:backup_created_at].to_i}_gitlab_ci_backup.tar"
+ tar_file = "#{s[:backup_created_at].to_i}_gitlab_ci_backup.tar.gz"
Dir.chdir(GitlabCi.config.backup.path) do
File.open("#{GitlabCi.config.backup.path}/backup_information.yml",
@@ -20,7 +20,7 @@ module Backup
# create archive
$progress.print "Creating backup archive: #{tar_file} ... "
orig_umask = File.umask(0077)
- if Kernel.system('tar', '-cf', tar_file, *backup_contents)
+ if Kernel.system('tar', '-czf', tar_file, *backup_contents)
$progress.puts "done".green
else
puts "creating archive #{tar_file} failed".red
@@ -77,11 +77,11 @@ module Backup
removed = 0
Dir.chdir(GitlabCi.config.backup.path) do
- file_list = Dir.glob('*_gitlab_ci_backup.tar')
- file_list.map! { |f| $1.to_i if f =~ /(\d+)_gitlab_ci_backup.tar/ }
+ file_list = Dir.glob('*_gitlab_ci_backup.tar.gz')
+ file_list.map! { |f| $1.to_i if f =~ /(\d+)_gitlab_ci_backup.tar.gz/ }
file_list.sort.each do |timestamp|
if Time.at(timestamp) < (Time.now - keep_time)
- if Kernel.system(*%W(rm #{timestamp}_gitlab_ci_backup.tar))
+ if Kernel.system(*%W(rm #{timestamp}_gitlab_ci_backup.tar.gz))
removed += 1
end
end
@@ -98,7 +98,7 @@ module Backup
Dir.chdir(GitlabCi.config.backup.path)
# check for existing backups in the backup dir
- file_list = Dir.glob("*_gitlab_ci_backup.tar").each.map { |f| f.split(/_/).first.to_i }
+ file_list = Dir.glob("*_gitlab_ci_backup.tar.gz").each.map { |f| f.split(/_/).first.to_i }
puts "no backups found" if file_list.count == 0
if file_list.count > 1 && ENV["BACKUP"].nil?
@@ -107,7 +107,7 @@ module Backup
exit 1
end
- tar_file = ENV["BACKUP"].nil? ? File.join("#{file_list.first}_gitlab_ci_backup.tar") : File.join(ENV["BACKUP"] + "_gitlab_ci_backup.tar")
+ tar_file = ENV["BACKUP"].nil? ? File.join("#{file_list.first}_gitlab_ci_backup.tar.gz") : File.join(ENV["BACKUP"] + "_gitlab_ci_backup.tar.gz")
unless File.exists?(tar_file)
puts "The specified backup doesn't exist!"
@@ -116,7 +116,7 @@ module Backup
$progress.print "Unpacking backup ... "
- unless Kernel.system(*%W(tar -xf #{tar_file}))
+ unless Kernel.system(*%W(tar -xzf #{tar_file}))
puts "unpacking backup failed".red
exit 1
else