From 88a4ec5f1b310ea8a1ee466f7c97f1f53528df3e Mon Sep 17 00:00:00 2001 From: Sam Date: Thu, 21 Dec 2017 09:00:23 +1100 Subject: [PATCH] FIX: stop forking regular backup jobs --- app/jobs/regular/create_backup.rb | 2 +- lib/backup_restore/backup_restore.rb | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/jobs/regular/create_backup.rb b/app/jobs/regular/create_backup.rb index 1f5313b071e..f9327567c66 100644 --- a/app/jobs/regular/create_backup.rb +++ b/app/jobs/regular/create_backup.rb @@ -5,7 +5,7 @@ module Jobs sidekiq_options retry: false 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 diff --git a/lib/backup_restore/backup_restore.rb b/lib/backup_restore/backup_restore.rb index c16314f98c0..99789e139ca 100644 --- a/lib/backup_restore/backup_restore.rb +++ b/lib/backup_restore/backup_restore.rb @@ -12,7 +12,11 @@ module BackupRestore LOGS_CHANNEL = "/admin/backups/logs" def self.backup!(user_id, opts = {}) - start! BackupRestore::Backuper.new(user_id, opts) + if opts[:fork] == false + BackupRestore::Backuper.new(user_id, opts).run + else + start! BackupRestore::Backuper.new(user_id, opts) + end end def self.restore!(user_id, opts = {})