watership 0.9.2 → 0.9.3pre

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7835bdb83a4a8f081115ca051b4062364866f29e
-  data.tar.gz: 266209a3236afba8a2a377beac5b27caa1763f67
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NTQ4OGY2NWM3NjJlYjU3M2EwNzk2OTVkNjgzMWRmNWI5NGQxMWYzOQ==
+  data.tar.gz: !binary |-
+    MjVhYzA3Y2I2NDc3YTdhYWY0NDEzNmU5NjM5ODE3MzE4NzMwYjBiOA==
 SHA512:
-  metadata.gz: a824cfd74887e18631ab6ac0a1fdebdbf1fd4132ad96e140a410d053a97a011fdcae4b0349f9b560d371c943f19c13aca5565dd16bbe256369de53d7465985b0
-  data.tar.gz: 1dd1d097d932e7f547b69bff93bdf283a4086126a4bd5d45560c38cdb56e223b41c9b662e90175766148b6b949a191e1b003e8b04d229d1b8573ec587fd3ae6b
+  metadata.gz: !binary |-
+    Yzc5NjI1NGI4NjZkNWEzNmI3MzFiOTM3Y2U5MzljODA4NWU2ZjU1ODBjY2U1
+    MGM5NDQzMGU5ZjBjN2RjYjYzNWMyYzVhZGFjZWVjZjNhZTM4OGZhZTQwNDAw
+    NmU0ZDFlODBlOGJhMmQwNWMyNWM5M2RkYWY4M2RlOTNlNjAyMWU=
+  data.tar.gz: !binary |-
+    ZDc5ODVlYTkzMTc2MTlhN2VlMmZkNWZkOTcyNWVmMjhhZDM2ODM5MThhYjU2
+    ZmZmZTgxNGE1MTRlOTM3NDQ2MDUzMWY1NWUwODg3ZTY3YjIyZWQyYTUyMTA3
+    NDIxNWFlNjcyN2RlNTAwNmY4OGU4OTE4NTQ3YmJlM2IyMDRhNjg=

data/lib/watership/consumer.rb

@@ -9,52 +9,42 @@ module Watership
       @url = url
       @prefetch = channel_options.delete(:prefetch) || Integer(ENV.fetch("RABBIT_CONSUMER_PREFETCH", 200))
       @concurrency = channel_options.delete(:concurrency) || 1
-      @channel_opts = {durable: true}.merge(channel_options)
-      @queue_opts = {block: false, manual_ack: true}.merge(queue_options)
+      @forever = channel_options.delete(:forever) || true
+      @channel_opts = { durable: true }.merge(channel_options)
+      @queue_opts = { block: false, manual_ack: true }.merge(queue_options)
     end
 
     def consume
-      Thread.abort_on_exception = true
       queue = create_queue
-      @concurrency.times do
-        Thread.new do
-          queue.subscribe(@queue_opts.dup) do |delivery_info, properties, payload|
-            begin
-              data = JSON.parse(payload)
-              @consumer.new.call(data)
-              success = true
-            rescue StandardError => exception
-              logger.error "Error thrown in subscribe block"
-              logger.error exception.message
-              logger.error exception.backtrace.join("\n")
-
-              retries = data["retries"] || 0
-              notify(exception, { payload: data, retries: retries })
-              enqueue(data.merge(retries: (retries + 1)))
-              success = true
-            rescue Interrupt => exception
-              logger.error "Interrupt in subscribe block"
-              logger.warn "Stopped gracefully."
-            ensure
-              if success
-                ack_message(delivery_info.delivery_tag)
-              else
-                reject_message(delivery_info.delivery_tag)
-              end
-
-              clear_active_record_connections
-            end
+      queue.subscribe(@queue_opts.dup) do |delivery_info, properties, payload|
+        begin
+          data = JSON.parse(payload)
+          @consumer.new.call(data)
+          success = true
+        rescue StandardError => exception
+          logger.error "Error thrown in subscribe block"
+          logger.error exception.message
+          logger.error exception.backtrace.join("\n")
+
+          retries = data["retries"] || 0
+          notify(exception, { payload: data, retries: retries })
+          enqueue(data.merge(retries: (retries + 1)))
+          success = true
+        rescue Interrupt => exception
+          logger.error "Interrupt in subscribe block"
+          logger.warn "Stopped gracefully."
+        ensure
+          if success
+            ack_message(delivery_info.delivery_tag)
+          else
+            reject_message(delivery_info.delivery_tag)
           end
+
+          clear_active_record_connections
         end
       end
 
-      # sleep forever
-      sleeping_thread = Thread.new { sleep }
-      Signal.trap("TERM") do
-        sleeping_thread.terminate
-      end
-      sleeping_thread.join
-    rescue Interrupt
+      self.class.sleep_forever if @forever
     ensure
       logger.info "Closing Channel"
       channel.close
@@ -108,5 +98,14 @@ module Watership
         ::ActiveRecord::Base.clear_active_connections!
       end
     end
+
+    def self.sleep_forever
+      sleepy_thread = Thread.new { sleep }
+      Signal.trap("TERM") do
+        sleepy_thread.terminate
+      end
+      sleepy_thread.join
+    rescue Interrupt
+    end
   end
 end

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = "0.9.2"
+  VERSION = "0.9.3pre"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3pre
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-04 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Wrapper around Bunny to better handle connection issues
@@ -74,7 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
@@ -96,14 +96,14 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2