watership 0.5.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7297b8a86504f62a6feb98b9ac8e19cdb75a3ed
-  data.tar.gz: 7b1d6e124680d147984f74d95ba19ae214b1d0a5
+  metadata.gz: d9d75218a0e116036973c5143327e02200e90d5e
+  data.tar.gz: 8f2ab743f84f7816d64c4bf57d9830c559c2f025
 SHA512:
-  metadata.gz: 9020adfcab698655ba127462d402a55b272ae6b1e8526325d956402286dc4feb3891dfb8eed2b4659f85ebd94049b6408f22275efe0f5a82e231ec121f315929
-  data.tar.gz: 292aa5b5b7d0d8a3af1a1acadba27549c034c35048b4d035eba8f5945991127c11966b51e2b50d9e962285e0c526944d595d8f07a17f0aba0698215b9287d3d8
+  metadata.gz: 7aff983c5122210505b47edcf200099e1fb4f530bdf0efaf6ae0cd624f7676e33bdb42ad772d8553855ec469735a6ba7eee9e1777e61c3f4b183eb3e67093cb5
+  data.tar.gz: 399868642a4ab1ba89881c720d053e940d472d9b5c7c7deeb45fe239579251e6281eee4aa97f829ae51c92ff3e9b48b3b3299097f40b3ce8a3eac3164b57f226

data/CHANGELOG.md

@@ -1,5 +1,22 @@
 # Changelog
 
+## 0.7.1 - 2014-07-22
+* Fix a critical bug during reconnect
+
+## 0.7.0 - 2014-07-21 [yanked]
+* Adding bang methods to re-raise recused errors
+
+## 0.6.0 - 2014-07-18 [yanked]
+* Acknoledges failed messages after they are re-enqueued
+* Added thread safety
+* Added bugsnug support
+
+## 0.5.5 - 2014-07-12
+* Adding general support for Bugsnag
+
+## 0.5.0 - 2014-07-10
+* Add support for running multiple threads in a single consumer.
+
 ## 0.4.0 - 2014-07-10
 * Add retry behavior on messages that generate exceptions in `Watership::Consumer`.
 

data/lib/watership/consumer.rb

@@ -8,19 +8,21 @@ module Watership
       @consumer = consumer
       @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, ack: true}.merge(queue_options)
     end
 
-    def consume(concurrency = 1)
+    def consume(donotuse = :donotuse)
+      logger.error("Don't provide an argument to Consumer#consume") unless donotuse == :donotuse
+
       Thread.abort_on_exception = true
-      concurrency.times do
+      @concurrency.times do
         queue.subscribe(@queue_opts) do |delivery_info, properties, payload|
-          success = true
-          data = JSON.parse(payload)
           begin
+            data = JSON.parse(payload)
             @consumer.call(data)
-            ack_message(delivery_info.delivery_tag)
+            success = true
           rescue StandardError => exception
             logger.error "Error thrown in subscribe block"
             logger.error exception.message
@@ -28,19 +30,21 @@ module Watership
 
             retries = data["retries"] || 0
 
+            Airbrake.notify(exception) if defined?(Airbrake)
+            Bugsnag.notify(exception, data: {payload: data, retries: retries}) if defined?(Bugsnag)
+
             if retries.to_i < 3
               Watership.enqueue(name: @consumer.class::QUEUE, payload: data.merge({retries: retries+1}))
+              success = true
             end
-
-            Airbrake.notify(exception) if defined?(Airbrake)
-            Bugsnag.notify(exception, data: {payload: data, retries: retries}) if defined?(Bugsnag)
           rescue Interrupt => exception
-            success = false
             logger.error "Interrupt in subscribe block"
             logger.warn "Stopped gracefully."
             throw(:terminate)
           ensure
-            unless success
+            if success
+              ack_message(delivery_info.delivery_tag)
+            else
               reject_message(delivery_info.delivery_tag)
             end
           end
@@ -80,7 +84,7 @@ module Watership
 
     def channel
       @channel ||= begin
-        c = connection.create_channel
+        c = connection.create_channel(nil, @concurrency)
         c.prefetch(@prefetch)
         c
       end

data/lib/watership/version.rb

@@ -1,3 +1,3 @@
 module Watership
-  VERSION = '0.5.0'
+  VERSION = '0.7.1'
 end

data/lib/watership.rb

@@ -19,7 +19,11 @@ module Watership
       @config = uri
     end
 
-    def enqueue(options = {})
+    def enqueue!(options = {})
+      enqueue(options, true)
+    end
+
+    def enqueue(options = {}, reraise = false)
       options  = options.dup
       message  = options.delete(:message)
       name     = options.delete(:name)
@@ -31,6 +35,7 @@ module Watership
       fallback.call if fallback
       notify(exception)
       logger.error(exception.class.name)
+      raise exception if reraise
     end
 
     def connect_with_queue(name, options = {})
@@ -38,23 +43,25 @@ module Watership
     end
 
     def reconnect
-      $channel = nil
+      Thread.current[:bunny_channel] = nil
+      $bunny_connection = nil
       channel
       true
     end
 
     def channel
-      $channel ||= connection.create_channel
+      Thread.current[:bunny_channel] ||= connection.create_channel
     rescue *CONNECTION_EXCEPTIONS => exception
       notify(exception)
-      $channel = nil
+      Thread.current[:bunny_channel] = nil
     end
 
     def connection
-      Bunny.new(@config).tap { |bunny| bunny.start }
+      $bunny_connection ||= Bunny.new(@config).tap { |bunny| bunny.start }
     end
 
     def notify(exception)
+      Bugsnag.notify(exception) if defined?(Bugsnag) && @env == 'production'
       Airbrake.notify_or_ignore(exception) if defined?(Airbrake) && @env == 'production'
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watership
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Ben Scofield
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler