mirror of
https://github.com/discourse/discourse.git
synced 2024-12-16 13:12:42 +08:00
FIX: Make sure constant reflects the right backup extenstion.
This commit is contained in:
parent
e4c5cb84cd
commit
5b3cbd3c9d
|
@ -7,7 +7,8 @@ module BackupRestore
|
||||||
class OperationRunningError < RuntimeError; end
|
class OperationRunningError < RuntimeError; end
|
||||||
|
|
||||||
VERSION_PREFIX = "v".freeze
|
VERSION_PREFIX = "v".freeze
|
||||||
DUMP_FILE = "dump.sql"
|
DUMP_FILE = "dump.sql.gz".freeze
|
||||||
|
OLD_DUMP_FILE = "dump.sql".freeze
|
||||||
METADATA_FILE = "meta.json"
|
METADATA_FILE = "meta.json"
|
||||||
LOGS_CHANNEL = "/admin/backups/logs"
|
LOGS_CHANNEL = "/admin/backups/logs"
|
||||||
|
|
||||||
|
|
|
@ -81,7 +81,7 @@ module BackupRestore
|
||||||
@current_db = RailsMultisite::ConnectionManagement.current_db
|
@current_db = RailsMultisite::ConnectionManagement.current_db
|
||||||
@timestamp = Time.now.strftime("%Y-%m-%d-%H%M%S")
|
@timestamp = Time.now.strftime("%Y-%m-%d-%H%M%S")
|
||||||
@tmp_directory = File.join(Rails.root, "tmp", "backups", @current_db, @timestamp)
|
@tmp_directory = File.join(Rails.root, "tmp", "backups", @current_db, @timestamp)
|
||||||
@dump_filename = "#{File.join(@tmp_directory, BackupRestore::DUMP_FILE)}.gz"
|
@dump_filename = File.join(@tmp_directory, BackupRestore::DUMP_FILE)
|
||||||
@archive_directory = File.join(Rails.root, "public", "backups", @current_db)
|
@archive_directory = File.join(Rails.root, "public", "backups", @current_db)
|
||||||
@archive_basename = File.join(@archive_directory, "#{SiteSetting.title.parameterize}-#{@timestamp}-#{BackupRestore::VERSION_PREFIX}#{BackupRestore.current_version}")
|
@archive_basename = File.join(@archive_directory, "#{SiteSetting.title.parameterize}-#{@timestamp}-#{BackupRestore::VERSION_PREFIX}#{BackupRestore.current_version}")
|
||||||
|
|
||||||
|
|
|
@ -116,9 +116,9 @@ module BackupRestore
|
||||||
@dump_filename =
|
@dump_filename =
|
||||||
if @is_archive
|
if @is_archive
|
||||||
if system('tar', '--list', '--file', @source_filename, BackupRestore::OLD_DUMP_FILE)
|
if system('tar', '--list', '--file', @source_filename, BackupRestore::OLD_DUMP_FILE)
|
||||||
File.join(@tmp_directory, BackupRestore::DUMP_FILE)
|
File.join(@tmp_directory, BackupRestore::OLD_DUMP_FILE)
|
||||||
else
|
else
|
||||||
File.join(@tmp_directory, "#{BackupRestore::DUMP_FILE}.gz")
|
File.join(@tmp_directory, BackupRestore::DUMP_FILE)
|
||||||
end
|
end
|
||||||
else
|
else
|
||||||
File.join(@tmp_directory, @filename)
|
File.join(@tmp_directory, @filename)
|
||||||
|
|
Loading…
Reference in New Issue
Block a user