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

Rename handle_exception to handle_job_exception

Browse Source
This commit is contained in:
riking
2015-02-09 12:47:46 -08:00
parent b7f45f6667
commit 5657006aca
13 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/scheduler/defer.rb
View File

@@ -51,10 +51,10 @@ module Scheduler
RailsMultisite::ConnectionManagement.establish_connection(db: db) if db
job.call
rescue => ex
Discourse.handle_exception(ex, {message: "Running deferred code '#{desc}'"})
Discourse.handle_job_exception(ex, {message: "Running deferred code '#{desc}'"})
end
rescue => ex
Discourse.handle_exception(ex, {message: "Processing deferred code queue"})
Discourse.handle_job_exception(ex, {message: "Processing deferred code queue"})
ensure
ActiveRecord::Base.connection_handler.clear_active_connections!
end

8
lib/scheduler/manager.rb
View File

@@ -42,13 +42,13 @@ module Scheduler
def keep_alive
@manager.keep_alive
rescue => ex
Discourse.handle_exception(ex, {message: "Scheduling manager keep-alive"})
Discourse.handle_job_exception(ex, {message: "Scheduling manager keep-alive"})
end
def reschedule_orphans
@manager.reschedule_orphans!
rescue => ex
Discourse.handle_exception(ex, {message: "Scheduling manager orphan rescheduler"})
Discourse.handle_job_exception(ex, {message: "Scheduling manager orphan rescheduler"})
end
def process_queue
@@ -66,7 +66,7 @@ module Scheduler
# Discourse.handle_exception was already called, and we don't have any extra info to give
failed = true
rescue => e
Discourse.handle_exception(e, {message: "Running a scheduled job", job: klass})
Discourse.handle_job_exception(e, {message: "Running a scheduled job", job: klass})
failed = true
end
duration = ((Time.now.to_f - start) * 1000).to_i
@@ -77,7 +77,7 @@ module Scheduler
@mutex.synchronize { info.write! }
end
rescue => ex
Discourse.handle_exception(ex, {message: "Processing scheduled job queue"})
Discourse.handle_job_exception(ex, {message: "Processing scheduled job queue"})
ensure
@running = false
end