Skip to content

Commit

Permalink
Merge pull request #115 from nownabe/bump_thread
Browse files Browse the repository at this point in the history
Bump thread gem to 0.1.7
  • Loading branch information
jondot committed Apr 9, 2015
2 parents 9d86c82 + 981eb85 commit 99e7863
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: ruby
rvm:
- 2.2.0
- 2.1.0
- 2.2
- 2.1
- 2.0.0
- 1.9.3
2 changes: 1 addition & 1 deletion lib/sneakers/queue.rb
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ def subscribe(worker)
# has the same configuration as the worker. Also pass along the exchange and
# queue in case the handler requires access to them (for things like binding
# retry queues, etc).
handler_klass = worker.opts[:handler] || Sneakers::CONFIG[:handler]
handler_klass = worker.opts[:handler] || Sneakers::CONFIG.fetch(:handler)
handler = handler_klass.new(@channel, queue, worker.opts)

@consumer = queue.subscribe(:block => false, :manual_ack => @opts[:ack]) do | delivery_info, metadata, msg |
Expand Down
2 changes: 1 addition & 1 deletion sneakers.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ Gem::Specification.new do |gem|
gem.require_paths = ['lib']
gem.add_dependency 'serverengine', '~> 1.5.5'
gem.add_dependency 'bunny', '~> 1.7.0'
gem.add_dependency 'thread', '0.1.5'
gem.add_dependency 'thread', '~> 0.1.7'
gem.add_dependency 'thor'

gem.add_development_dependency 'rr'
Expand Down
6 changes: 2 additions & 4 deletions spec/sneakers/queue_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,6 @@


describe Sneakers::Queue do
before do
Sneakers.configure
end

let :queue_vars do
{
:prefetch => 25,
Expand All @@ -21,6 +17,8 @@
end

before do
Sneakers.configure

@mkbunny = Object.new
@mkchan = Object.new
@mkex = Object.new
Expand Down

0 comments on commit 99e7863

Please sign in to comment.