hutch 0.4.4 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6223e5fd8a9f235bf48be6e9483bdff8b576760
-  data.tar.gz: 26ee2809ebcbb1db622d7d97f4df786ef2355a6d
+  metadata.gz: 107ee67686b10db84f9e890b9f0f082a2c155b41
+  data.tar.gz: 23465bcdb425ffdd3fe1411d88e91b5817f8aeb1
 SHA512:
-  metadata.gz: 198269f485ddfc27bb93eb2d224cf299429a70df9c4231405ac21c3c9beae97872890199344576b252e9b1d75b115aabcf1ed1ff5d2b5f2eb0b219408709cedf
-  data.tar.gz: 9127a929b25b9ca1330f0da038695abf3efc49f7aa1d78e6f4344f37d6b6a7f88199154374885d000886aed99d2ac0f4e8bd0cddb754ca91e75ac1a471edb87c
+  metadata.gz: 8ae2a6b72c937256009cab231cc45b3b63b45e9915cdde0ea1d08408c9b4d9560de053d24bb30f72afdd9e72d1687b39bbfe6cbf5aed6246ff96bba903648616
+  data.tar.gz: 915f42a2056f6449693f5b05ff4ae7645231a1d9a42d94760cfe7548f5bb4bf0ed6cb2bce9c897bea4ee33d8ed1c86295ddc6b4f715e30f2448ac472b351f8b4

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.4.5 - October 15, 2013
+
+- No exception raised when hutch is run with no consumers. Instead, a warning
+  is logged.
+- Internal refactoring: use Bunny's shiny `ConsumerWorkPool#threads`
+  attr_reader.
+
 ## 0.4.4 - October 12, 2013
 
 - Friendlier Message#inspect, doesn't spew out detailed bunny info.

data/hutch.gemspec

@@ -1,7 +1,7 @@
 require File.expand_path('../lib/hutch/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.add_runtime_dependency 'bunny', '~> 0.10.6'
+  gem.add_runtime_dependency 'bunny', '>= 0.10.8'
   gem.add_runtime_dependency 'carrot-top', '~> 0.0.7'
   gem.add_runtime_dependency 'multi_json', '~> 1.5'
   gem.add_development_dependency 'rspec', '~> 2.12.0'

data/lib/hutch/broker.rb

@@ -132,15 +132,10 @@ module Hutch
     # Each subscriber is run in a thread. This calls Thread#join on each of the
     # subscriber threads.
     def wait_on_threads(timeout)
-      # HACK: work_pool.join doesn't allow a timeout to be passed in, so we
-      #       use instance_variable_get to gain access to the threadpool, and
-      #       manuall call thread.join with a timeout
-      threads = work_pool_threads
-
       # Thread#join returns nil when the timeout is hit. If any return nil,
       # the threads didn't all join so we return false.
-      per_thread_timeout = timeout.to_f / threads.length
-      threads.none? { |thread| thread.join(per_thread_timeout).nil? }
+      per_thread_timeout = timeout.to_f / work_pool_threads.length
+      work_pool_threads.none? { |thread| thread.join(per_thread_timeout).nil? }
     end
 
     def stop
@@ -167,8 +162,7 @@ module Hutch
     private
 
     def work_pool_threads
-      # TODO: fix bunny so we don't need to do this
-      @channel.work_pool.instance_variable_get(:@threads)
+      @channel.work_pool.threads || []
     end
 
     def generate_id

data/lib/hutch/version.rb

@@ -1,4 +1,4 @@
 module Hutch
-  VERSION = '0.4.4'.freeze
+  VERSION = '0.4.5'.freeze
 end
 

data/lib/hutch/worker.rb

@@ -8,9 +8,8 @@ module Hutch
     include Logging
 
     def initialize(broker, consumers)
-      @broker = broker
-      raise WorkerSetupError.new('no consumers loaded') if consumers.empty?
-      @consumers = consumers
+      @broker        = broker
+      self.consumers = consumers
     end
 
     # Run the main event loop. The consumers will be set up with queues, and
@@ -100,5 +99,13 @@ module Hutch
         backend.handle(message_id, consumer, ex)
       end
     end
+
+    def consumers=(val)
+      if val.empty?
+        logger.warn 'no consumer loaded, ensure there\'s' +
+                    'no configuration issue'
+      end
+      @consumers = val
+    end
   end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: hutch
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: 0.4.5
 platform: ruby
 authors:
 - Harry Marr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.10.6
+        version: 0.10.8
 - !ruby/object:Gem::Dependency
   name: carrot-top
   requirement: !ruby/object:Gem::Requirement