watership 0.9.0pre4 → 0.9.2

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MjdhOGViYzhhYWQ3NWYzY2IxYjY4ZTVhZDM1MjNmZTAyODg1Mjk0MA==
-  data.tar.gz: !binary |-
-    YWFkNzk2Y2M1YTllZWE5N2Y3MTFiODkxMDYzMDZlMWQ1ZjIxZWVkYQ==
+SHA1:
+  metadata.gz: 7835bdb83a4a8f081115ca051b4062364866f29e
+  data.tar.gz: 266209a3236afba8a2a377beac5b27caa1763f67
 SHA512:
-  metadata.gz: !binary |-
-    Y2RhNmQwZWNjNjM2OTQ5MDZhYTQ2YmQwZjBjNzM0OWJlYzU3ODhlZDI2ZWYw
-    MzJmMDAwODNjNWYxMzk2NDU4YTg4MTMwOGRlNDE1NTAxOTU5MjU4MWIzMjBh
-    YzAxMzc2NmMyOTE4YmQ0Y2Q1ZThlNDcwNDY1YTdjNzc0MWZjMWI=
-  data.tar.gz: !binary |-
-    ZjExNGMxNWI0NDczZGQ5NTdhMThiM2U2NTEwOGU0YjI4OWFiZmI0OTFlMGEw
-    MzM0MDM4ZjJmZWM5Y2RiYWU5Y2JkZjcxY2NlNDgwOGY3Yjc2NTk1YjA2MGQ3
-    N2YzMmExNGYwODM1NTgzN2M3MDE4NjljMzUzYTY5ZWFiYWUwNGI=
+  metadata.gz: a824cfd74887e18631ab6ac0a1fdebdbf1fd4132ad96e140a410d053a97a011fdcae4b0349f9b560d371c943f19c13aca5565dd16bbe256369de53d7465985b0
+  data.tar.gz: 1dd1d097d932e7f547b69bff93bdf283a4086126a4bd5d45560c38cdb56e223b41c9b662e90175766148b6b949a191e1b003e8b04d229d1b8573ec587fd3ae6b

data/lib/watership.rb

@@ -12,6 +12,7 @@ module Watership
 
   CLEAR_CONNECTION_EXCEPTIONS = [
     Bunny::ConnectionError,
+    Bunny::ClientTimeout,
     Timeout::Error
   ]
 
@@ -60,10 +61,13 @@ module Watership
     registered.fetch(name.to_sym).enqueue(opts)
   end
 
+  class << self
+    alias enqueue! enqueue
+  end
+
   class Client
     def initialize(uri, env)
-      @uri = uri
-      @env = env
+      @uri, @env = uri, env
     end
 
     def enqueue(options = {})
@@ -78,7 +82,6 @@ module Watership
 
       queue = connect_with_queue(name, options)
       queue.publish(JSON.generate(message))
-
     rescue *CONNECTION_EXCEPTIONS => exception
       fallback.call if fallback
       notify(exception)

data/lib/watership/consumer.rb

@@ -15,33 +15,34 @@ module Watership
 
     def consume
       Thread.abort_on_exception = true
+      queue = create_queue
       @concurrency.times do
-        queue.subscribe(@queue_opts) 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")
+        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
+              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
 
-            Airbrake.notify(exception) if defined?(Airbrake)
-            Bugsnag.notify(exception, data: {payload: data, retries: retries}) if defined?(Bugsnag)
-
-            new_data = data.merge({retries: retries+1})
-            Watership.enqueue!(name: @consumer::QUEUE, message: new_data)
-            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)
+              clear_active_record_connections
             end
           end
         end
@@ -60,7 +61,7 @@ module Watership
     end
 
     def bind(name, opts = {})
-      queue.bind(name, opts)
+      create_queue.bind(name, opts)
     end
 
     def ack_message(tag)
@@ -73,8 +74,8 @@ module Watership
       channel.reject(tag, requeue)
     end
 
-    def queue
-      @queue ||= channel.queue(@consumer::QUEUE, @channel_opts)
+    def create_queue
+      channel.queue(@consumer::QUEUE, @channel_opts)
     end
 
     def connection
@@ -83,14 +84,29 @@ module Watership
 
     def channel
       @channel ||= begin
-        c = connection.create_channel(nil, @concurrency)
-        c.prefetch(@prefetch)
-        c
+        created_channel = connection.create_channel(nil, @concurrency)
+        created_channel.prefetch(@prefetch)
+        created_channel
       end
     end
 
+    def enqueue(message)
+      create_queue.publish(JSON.generate(message))
+    end
+
+    def notify(exception, data)
+      Airbrake.notify(exception) if defined?(Airbrake)
+      Bugsnag.notify(exception, data: data) if defined?(Bugsnag)
+    end
+
     def logger
       @logger ||= defined?(Rails) ? Rails.logger : Logger.new(STDOUT)
     end
+
+    def clear_active_record_connections
+      if defined?(::ActiveRecord::Base) && ::ActiveRecord::Base.respond_to?(:clear_active_connections!)
+        ::ActiveRecord::Base.clear_active_connections!
+      end
+    end
   end
 end

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = "0.9.0pre4"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,69 +1,69 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.9.0pre4
+  version: 0.9.2
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-03 00:00:00.000000000 Z
+date: 2014-11-04 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: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2