github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-21 18:12:32 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: don't break the message bus when restoring a backup

Browse Source
This commit is contained in:
Régis Hanol
2015-08-27 20:02:13 +02:00
parent 2589a75c46
commit 96c23d51a2
8 changed files with 78 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/admin/backups_controller.rb
View File

@ -25,7 +25,8 @@ class Admin::BackupsController < Admin::AdminController
def create
opts = {
publish_to_message_bus: true,
with_uploads: params.fetch(:with_uploads) == "true"
with_uploads: params.fetch(:with_uploads) == "true",
client_id: params[:client_id],
}
BackupRestore.backup!(current_user.id, opts)
rescue BackupRestore::OperationRunningError
@ -70,8 +71,12 @@ class Admin::BackupsController < Admin::AdminController
end
def restore
filename = params.fetch(:id)
BackupRestore.restore!(current_user.id, filename, true)
opts = {
filename: params.fetch(:id),
client_id: params.fetch(:client_id),
publish_to_message_bus: true,
}
BackupRestore.restore!(current_user.id, opts)
rescue BackupRestore::OperationRunningError
render json: failed_json.merge(message: I18n.t("backup.operation_already_running"))
else