IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

FIX: stop forking regular backup jobs

Browse Source
This commit is contained in:
Sam 2017-12-21 09:00:23 +11:00
parent 744bb72cf9
commit 88a4ec5f1b
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/jobs/regular/create_backup.rb
View File

@ -5,7 +5,7 @@ module Jobs
sidekiq_options retry: false sidekiq_options retry: false
def execute(args) def execute(args)
BackupRestore.backup!(Discourse.system_user.id, publish_to_message_bus: false, with_uploads: SiteSetting.backup_with_uploads) BackupRestore.backup!(Discourse.system_user.id, publish_to_message_bus: false, with_uploads: SiteSetting.backup_with_uploads, fork: false)
end end
end end
end end

4
lib/backup_restore/backup_restore.rb
View File

@ -12,8 +12,12 @@ module BackupRestore
LOGS_CHANNEL = "/admin/backups/logs" LOGS_CHANNEL = "/admin/backups/logs"
def self.backup!(user_id, opts = {}) def self.backup!(user_id, opts = {})
if opts[:fork] == false
BackupRestore::Backuper.new(user_id, opts).run
else
start! BackupRestore::Backuper.new(user_id, opts) start! BackupRestore::Backuper.new(user_id, opts)
end end
end
def self.restore!(user_id, opts = {}) def self.restore!(user_id, opts = {})
start! BackupRestore::Restorer.new(user_id, opts) start! BackupRestore::Restorer.new(user_id, opts)