Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions lib/delayed_job/threaded_worker.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,18 @@
module Delayed
class ThreadedWorker < Delayed::Worker
# Plugin callbacks register against the base Delayed::Worker.lifecycle, so
# delegate to the base class to avoid rebuilding a separate lifecycle here
# (which would leak a callback per ThreadedWorker.new). Use superclass, not
# the Delayed::Worker constant, which tests may reassign to this subclass and
# cause infinite recursion.
def self.setup_lifecycle
superclass.setup_lifecycle
end

def self.lifecycle
superclass.lifecycle
end

def initialize(options={})
super
@num_threads = options[:num_threads]
Expand Down
10 changes: 10 additions & 0 deletions spec/unit/lib/delayed_job/threaded_worker_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,16 @@
worker = Delayed::ThreadedWorker.new({ num_threads: 2 })
expect(worker.instance_variable_get(:@grace_period_seconds)).to eq(30)
end

it 'does not accumulate enqueue lifecycle callbacks across instantiations' do
before_enqueue_callbacks = lambda do
Delayed::Worker.lifecycle.instance_variable_get(:@callbacks)[:enqueue].instance_variable_get(:@before).size
end

baseline = before_enqueue_callbacks.call
5.times { Delayed::ThreadedWorker.new(options) }
expect(before_enqueue_callbacks.call).to eq(baseline)
end
end

describe '#start' do
Expand Down
Loading