Commit e8b963fc authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3858 from abalkin/issue-3857

Save backup time as is.  Fixes #3857.
parents 81e60294 cef76fdd
...@@ -11,10 +11,11 @@ namespace :gitlab do ...@@ -11,10 +11,11 @@ namespace :gitlab do
Rake::Task["gitlab:backup:repo:create"].invoke Rake::Task["gitlab:backup:repo:create"].invoke
Rake::Task["gitlab:backup:uploads:create"].invoke Rake::Task["gitlab:backup:uploads:create"].invoke
# saving additional informations # saving additional informations
s = {} s = {}
s[:db_version] = "#{ActiveRecord::Migrator.current_version}" s[:db_version] = "#{ActiveRecord::Migrator.current_version}"
s[:backup_created_at] = "#{Time.now}" s[:backup_created_at] = Time.now
s[:gitlab_version] = %x{git rev-parse HEAD}.gsub(/\n/,"") s[:gitlab_version] = %x{git rev-parse HEAD}.gsub(/\n/,"")
s[:tar_version] = %x{tar --version | head -1}.gsub(/\n/,"") s[:tar_version] = %x{tar --version | head -1}.gsub(/\n/,"")
...@@ -25,8 +26,8 @@ namespace :gitlab do ...@@ -25,8 +26,8 @@ namespace :gitlab do
end end
# create archive # create archive
print "Creating backup archive: #{Time.now.to_i}_gitlab_backup.tar ... " print "Creating backup archive: #{s[:backup_created_at].to_i}_gitlab_backup.tar ... "
if Kernel.system("tar -cf #{Time.now.to_i}_gitlab_backup.tar repositories/ db/ uploads/ backup_information.yml") if Kernel.system("tar -cf #{s[:backup_created_at].to_i}_gitlab_backup.tar repositories/ db/ uploads/ backup_information.yml")
puts "done".green puts "done".green
else else
puts "failed".red puts "failed".red
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment