Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

FIX: Restoring could fail due to missing path

This commit is contained in:
Gerhard Schlager 2021-02-09 16:20:11 +01:00 committed by Gerhard Schlager
parent 4f5ea4fbde
commit 0b05302cfe
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/backup_restore/backup_file_handler.rb
View File

@ -6,7 +6,7 @@ module BackupRestore
delegate :log, to: :@logger, private: true delegate :log, to: :@logger, private: true
def initialize(logger, filename, current_db, root_tmp_directory = Rails.root, location = nil) def initialize(logger, filename, current_db, root_tmp_directory: Rails.root, location: nil)
@logger = logger @logger = logger
@filename = filename @filename = filename
@current_db = current_db @current_db = current_db

2
lib/backup_restore/factory.rb
View File

@ -28,7 +28,7 @@ module BackupRestore
end end
def create_backup_file_handler(filename, current_db, location) def create_backup_file_handler(filename, current_db, location)
BackupFileHandler.new(logger, filename, current_db, location) BackupFileHandler.new(logger, filename, current_db, location: location)
end end
end end
end end

6
spec/lib/backup_restore/backup_file_handler_spec.rb
View File

@ -19,7 +19,11 @@ describe BackupRestore::BackupFileHandler do
Dir.mktmpdir do |root_directory| Dir.mktmpdir do |root_directory|
current_db = RailsMultisite::ConnectionManagement.current_db current_db = RailsMultisite::ConnectionManagement.current_db
file_handler = BackupRestore::BackupFileHandler.new(logger, backup_filename, current_db, root_directory, location) file_handler = BackupRestore::BackupFileHandler.new(
logger, backup_filename, current_db,
root_tmp_directory: root_directory,
location: location
)
tmp_directory, db_dump_path = file_handler.decompress tmp_directory, db_dump_path = file_handler.decompress
expected_tmp_path = File.join(root_directory, "tmp/restores", current_db, "2019-12-24-143148") expected_tmp_path = File.join(root_directory, "tmp/restores", current_db, "2019-12-24-143148")