kotovalexarian-likes-github/mperham--sidekiq
1
0
Fork 0
mirror of https://github.com/mperham/sidekiq.git synced 2022-11-09 13:52:34 -05:00
Code Releases Activity

Don't shadow job method in Processor (#3225)

Browse source 
The Processor class has a `#job` method which was being shadowed in
`#process` by a local variable. The `#process` method is complex, and I
recently moved some code around in a way that accidentally resulted in
the instance method being used instead of the local variable.

By using a different name for the variable, making that same mistake
again will result in a `NameError` instead of doing the wrong thing.
This commit is contained in:
Eugene Kenny 2016-11-07 02:34:11 +00:00 committed by Mike Perham
parent d4b012bd8c
commit 702902927d
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/sidekiq/processor.rb
View file

@ -121,19 +121,19 @@ module Sidekiq
ack = false ack = false
begin begin
job = Sidekiq.load_json(jobstr) job_hash = Sidekiq.load_json(jobstr)
@reloader.call do @reloader.call do
klass = job['class'.freeze].constantize klass = job_hash['class'.freeze].constantize
worker = klass.new worker = klass.new
worker.jid = job['jid'.freeze] worker.jid = job_hash['jid'.freeze]
stats(worker, job, queue) do stats(worker, job_hash, queue) do
Sidekiq.server_middleware.invoke(worker, job, queue) do Sidekiq.server_middleware.invoke(worker, job_hash, queue) do
# Only ack if we either attempted to start this job or # Only ack if we either attempted to start this job or
# successfully completed it. This prevents us from # successfully completed it. This prevents us from
# losing jobs if a middleware raises an exception before yielding # losing jobs if a middleware raises an exception before yielding
ack = true ack = true
execute_job(worker, cloned(job['args'.freeze])) execute_job(worker, cloned(job_hash['args'.freeze]))
end end
end end
ack = true ack = true
@ -144,7 +144,7 @@ module Sidekiq
# we didn't properly finish it. # we didn't properly finish it.
ack = false ack = false
rescue Exception => ex rescue Exception => ex
handle_exception(ex, { :context => "Job raised exception", :job => job, :jobstr => jobstr }) handle_exception(ex, { :context => "Job raised exception", :job => job_hash, :jobstr => jobstr })
raise raise
ensure ensure
work.acknowledge if ack work.acknowledge if ack
@ -163,9 +163,9 @@ module Sidekiq
PROCESSED = Concurrent::AtomicFixnum.new PROCESSED = Concurrent::AtomicFixnum.new
FAILURE = Concurrent::AtomicFixnum.new FAILURE = Concurrent::AtomicFixnum.new
def stats(worker, job, queue) def stats(worker, job_hash, queue)
tid = thread_identity tid = thread_identity
WORKER_STATE[tid] = {:queue => queue, :payload => cloned(job), :run_at => Time.now.to_i } WORKER_STATE[tid] = {:queue => queue, :payload => cloned(job_hash), :run_at => Time.now.to_i }
begin begin
yield yield