From ec9e844ab31783cf9f5c0d8354a9c716b3a236c5 Mon Sep 17 00:00:00 2001 From: evazion Date: Mon, 27 Sep 2021 09:17:50 -0500 Subject: [PATCH] jobs: disable timeouts by default for all jobs. Fix a regression in 52bf4a3a6 that caused certain jobs to timeout. --- app/jobs/application_job.rb | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/app/jobs/application_job.rb b/app/jobs/application_job.rb index 2f5263d4b..8fff312fe 100644 --- a/app/jobs/application_job.rb +++ b/app/jobs/application_job.rb @@ -6,6 +6,14 @@ class ApplicationJob < ActiveJob::Base queue_as :default queue_with_priority 0 + around_perform do |_job, block| + CurrentUser.scoped(User.system, "127.0.0.1") do + ApplicationRecord.without_timeout do + block.call + end + end + end + discard_on ActiveJob::DeserializationError do |_job, error| DanbooruLogger.log(error) end