Skip to content

Add support for resque 2 #53

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MWGNZ wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add support for resque 2 #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c6068ef
Update to support resque 2
Jun 26, 2019
3cfffd0
Merge pull request #1 from optimalworkshop/Add-resque-2-support
Jul 8, 2019
e0d7971
Remove deprecated rdoc spec statement
May 6, 2021
0577af0
Merge pull request #2 from optimalworkshop/Remove-depricated-rdoc-spec
May 7, 2021
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
3 changes: 1 addition & 2 deletions resque-loner.gemspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@ Gem::Specification.new do |s|
s.email = ['jannis@moviepilot.com']
s.homepage = 'http://github.com/jayniz/resque-loner'
s.summary = 'Adds unique jobs to resque'
s.has_rdoc = false
s.license = 'MIT'

s.rubyforge_project = 'resque-loner'

s.add_dependency 'resque', '~>1.0'
s.add_dependency 'resque', '~>2.0'

%w(
airbrake
Expand Down
12 changes: 6 additions & 6 deletions test/worker_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,9 +433,9 @@ def self.perform
end

test 'reconnects to redis after fork' do
original_connection = Resque.redis.client.connection.instance_variable_get('@sock')
original_connection = Resque.redis._client.connection.instance_variable_get('@sock')
@worker.work(0)
assert_not_equal original_connection, Resque.redis.client.connection.instance_variable_get('@sock')
assert_not_equal original_connection, Resque.redis._client.connection.instance_variable_get('@sock')
end

if !defined?(RUBY_ENGINE) || defined?(RUBY_ENGINE) && RUBY_ENGINE != 'jruby'
Expand All @@ -447,7 +447,7 @@ class LongRunningJob
@queue = :long_running_job

def self.perform(run_time, rescue_time = nil)
Resque.redis.client.reconnect # get its own connection
Resque.redis._client.reconnect # get its own connection
Resque.redis.rpush('sigterm-test:start', Process.pid)
sleep run_time
Resque.redis.rpush('sigterm-test:result', 'Finished Normally')
Expand All @@ -466,7 +466,7 @@ def self.perform(run_time, rescue_time = nil)
# ensure we actually fork
$TESTING = false
# reconnect since we just forked
Resque.redis.client.reconnect
Resque.redis._client.reconnect

worker = Resque::Worker.new(:long_running_job)

Expand Down Expand Up @@ -511,7 +511,7 @@ class LongRunningJob
@queue = :long_running_job

def self.perform(run_time, rescue_time = nil)
Resque.redis.client.reconnect # get its own connection
Resque.redis._client.reconnect # get its own connection
Resque.redis.rpush('sigterm-test:start', Process.pid)
sleep run_time
Resque.redis.rpush('sigterm-test:result', 'Finished Normally')
Expand All @@ -529,7 +529,7 @@ def self.perform(run_time, rescue_time = nil)
# ensure we actually fork
$TESTING = false
# reconnect since we just forked
Resque.redis.client.reconnect
Resque.redis._client.reconnect

worker = Resque::Worker.new(:long_running_job)
worker.term_timeout = 1
Expand Down