diff options
| author | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:29:23 +0200 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2015-07-31 14:29:23 +0200 |
| commit | 04f2da3c37dfe0218033a2703afe35a0dc8d2686 (patch) | |
| tree | 2761840f0c3c108762996b292e393a7d158d0fae /lib/backup/database.rb | |
| parent | d9e26ca6d27f47ed2be922ccc6454a12f8ec87ac (diff) | |
| parent | a51a3fb8ed92a58b375125b19f75c3d4c545571a (diff) | |
| download | gitlab-ce-04f2da3c37dfe0218033a2703afe35a0dc8d2686.tar.gz | |
Merge branch 'master' into comment-updated-by
Diffstat (limited to 'lib/backup/database.rb')
| -rw-r--r-- | lib/backup/database.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/backup/database.rb b/lib/backup/database.rb index c5a5396cbbf..bbb230a10f0 100644 --- a/lib/backup/database.rb +++ b/lib/backup/database.rb @@ -7,7 +7,11 @@ module Backup def initialize @config = YAML.load_file(File.join(Rails.root,'config','database.yml'))[Rails.env] @db_dir = File.join(Gitlab.config.backup.path, 'db') - FileUtils.mkdir_p(@db_dir) unless Dir.exists?(@db_dir) + FileUtils.rm_rf(@db_dir) + # Ensure the parent dir of @db_dir exists + FileUtils.mkdir_p(Gitlab.config.backup.path) + # Fail if somebody raced to create @db_dir before us + FileUtils.mkdir(@db_dir, mode: 0700) end def dump @@ -25,7 +29,6 @@ module Backup abort 'Backup failed' unless success $progress.print 'Compressing database ... ' - FileUtils.rm_f db_file_name_gz success = system('gzip', db_file_name) report_success(success) abort 'Backup failed: compress error' unless success |