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

DEV: Prevent defer stats exception when thread aborted (#19863)

Browse Source 
When the thread is aborted, an exception is raised before the `start` of a job is set, and therefore raises an exception in the `ensure` block. This commit checks that `start` exists, and also adds `abort_on_exception=true` so that this issue would have caused test failures.
This commit is contained in:
David Taylor
2023-01-15 22:08:44 +00:00
committed by GitHub
parent f72875c729
commit 29f7ec7090
3 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/discourse.rb
View File

@ -191,6 +191,18 @@ module Discourse
reset_job_exception_stats!
if Rails.env.test?
def self.catch_job_exceptions!
raise "tests only" if !Rails.env.test?
@catch_job_exceptions = true
end
def self.reset_catch_job_exceptions!
raise "tests only" if !Rails.env.test?
remove_instance_variable(:@catch_job_exceptions)
end
end
# Log an exception.
#
# If your code is in a scheduled job, it is recommended to use the
@ -220,7 +232,7 @@ module Discourse
{ current_db: cm.current_db, current_hostname: cm.current_hostname }.merge(context),
)
raise ex if Rails.env.test?
raise ex if Rails.env.test? && !@catch_job_exceptions
end
# Expected less matches than what we got in a find