pebbles-river 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0738174b6c9733edbe9524576e2ecf48ca2ad56e
-  data.tar.gz: bdf513a26a16bd44be5a02dec8af1ac9b11f467f
+  metadata.gz: 32827f1f43724f8f2d5cf53943d89b519be5be11
+  data.tar.gz: 38db2f8b16ea69ca288e4f5c26c5debe1556356a
 SHA512:
-  metadata.gz: 9068b048fa0c91a0640d15d77756dc742c3add7aa0a3106fd50178bf86e58717caa0d917497879b92394b596d74353ae8ca7a9b2ee3ceda8a68455e0d4a6689b
-  data.tar.gz: 8f0747a995edcd03ca44e64122ef63187904263fe248a22417860a44f854da54ad40c4da1629a448868d0fca7f30ca1595648c64d70a1bb8788f488672fbef19
+  metadata.gz: 077a5f0d4d2dc0f2f02cd38b839b49bd14a5bb2201023e2fbdc3fc4f6e4ee6f2370fceba64d97e10e17fb609f14bb8f4af1601acbe8c439b3b23ebef4900b237
+  data.tar.gz: b2b43a50bdeba51c83dcdebec4bf94dce4096d239aabd7189954a19d6446c775949ca92eb0b78ca61453c4aab249676da214d425f8bc3d508c5eb01bca269a33

data/lib/pebbles/river/errors.rb

@@ -0,0 +1,17 @@
+module Pebbles
+  module River
+
+    class ConnectionError < StandardError
+      attr_reader :connection_exception
+
+      def initialize(message, connection_exception = nil)
+        super(message)
+        @connection_exception = connection_exception
+      end
+    end
+
+    class ConnectFailure < ConnectionError; end
+    class SendFailure < ConnectionError; end
+
+  end
+end

data/lib/pebbles/river/river.rb

@@ -1,17 +1,6 @@
 module Pebbles
   module River
 
-    class SendFailure < StandardError
-
-      attr_reader :connection_exception
-
-      def initialize(message, connection_exception = nil)
-        super(message)
-        @connection_exception = connection_exception
-      end
-
-    end
-
     class River
 
       attr_reader :environment
@@ -20,6 +9,7 @@ module Pebbles
         options = {environment: options} if options.is_a?(String)  # Backwards compatibility
 
         @environment = (options[:environment] || ENV['RACK_ENV'] || 'development').dup.freeze
+        @last_connect_attempt = nil
       end
 
       def connected?
@@ -28,18 +18,26 @@ module Pebbles
 
       def connect
         unless connected?
-          bunny.start
-          bunny.qos
+          handle_connection_error do
+            bunny.start
+            bunny.qos
+          end
         end
       end
 
       def disconnect
-        bunny.stop if connected?
+        if connected?
+          begin
+            bunny.stop
+          rescue *CONNECTION_EXCEPTIONS
+            # Ignore
+          end
+        end
       end
 
       def publish(options = {})
         connect
-        handle_connection_error do
+        handle_connection_error(SendFailure) do
           exchange.publish(options.to_json,
             persistent: options.fetch(:persistent, true),
             key: Routing.routing_key_for(options.slice(:event, :uid)))
@@ -79,21 +77,32 @@ module Pebbles
           @exchange ||= bunny.exchange(exchange_name, EXCHANGE_OPTIONS.dup)
         end
 
-        def handle_connection_error(&block)
-          retry_until = nil
-          begin
-            yield
-          rescue *CONNECTION_EXCEPTIONS => exception
-            retry_until ||= Time.now + 4
-            if Time.now < retry_until
-              sleep(0.5)
+        def handle_connection_error(exception_klass = ConnectFailure, &block)
+          last_exception = nil
+          Timeout.timeout(MAX_RETRY_TIMEOUT) do
+            retry_until, retry_count = nil, 0
+            begin
+              yield
+            rescue *CONNECTION_EXCEPTIONS => exception
+              last_exception = exception
+              retry_count += 1
+              backoff(retry_count)
               retry
-            else
-              raise SendFailure.new(exception.message, exception)
             end
           end
+        rescue Timeout::Error => timeout
+          last_exception ||= timeout
+          raise exception_klass.new(last_exception.message, last_exception)
         end
 
+        def backoff(iteration)
+          sleep([(1.0 / 2.0 * (2.0 ** [30, iteration].min - 1.0)).ceil, MAX_BACKOFF_SECONDS].min)
+        end
+
+        MAX_RETRY_TIMEOUT = 10
+
+        MAX_BACKOFF_SECONDS = MAX_RETRY_TIMEOUT
+
         QUEUE_OPTIONS = {durable: true}.freeze
 
         EXCHANGE_OPTIONS = {type: :topic, durable: :true}.freeze

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = "0.0.1"
+    VERSION = '0.0.2'
   end
 end

data/lib/pebbles/river.rb

@@ -6,6 +6,7 @@ require 'pebblebed/uid'
 require 'servolux'
 
 require_relative "river/version"
+require_relative "river/errors"
 require_relative "river/message"
 require_relative "river/worker"
 require_relative "river/subscription"

data/spec/lib/river_spec.rb

@@ -114,6 +114,10 @@ describe Pebbles::River::River do
 
           subject.stub(:exchange) { exchange }
           subject.stub(:sleep) { }
+          Timeout.stub(:timeout) { |&block|
+            block.call
+          }
+          expect(Timeout).to receive(:timeout).at_least(1).times
 
           expect(subject).to receive(:sleep).at_least(2).times
 
@@ -126,17 +130,33 @@ describe Pebbles::River::River do
 
     CONNECTION_EXCEPTIONS.each do |exception_class|
       context "on permanent failure with #{exception_class}" do
-        it "re-raises #{exception_class} wrapped in SendFailure exception" do
+        it "retries with exponential backoff until timeout and gives up with SendFailure" do
           exchange = double('exchange')
           exchange.stub(:publish) do
             raise exception_class.new
           end
-
           subject.stub(:exchange) { exchange }
-          subject.stub(:sleep) { }
 
-          expect(-> { subject.publish({event: 'explode', uid: 'thing:rspec$1'})}).to raise_error(
-            Pebbles::River::SendFailure)
+          count, sleeps = 0, []
+          subject.stub(:sleep) { |t|
+            count += 1
+            if count >= 10
+              raise Timeout::Error
+            end
+            sleeps.push(t)
+          }
+
+          Timeout.stub(:timeout) { |&block|
+            block.call
+          }
+          expect(Timeout).to receive(:timeout).at_least(1).times
+
+          expect(-> { subject.publish({event: 'explode', uid: 'thing:rspec$1'})}).to raise_error do |e|
+            e.should be Pebbles::River::SendFailure
+            e.exception.should be exception_class
+          end
+
+          expect(sleeps[0, 9]).to eq [1, 2, 4, 8, 10, 10, 10, 10, 10]
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-15 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
@@ -137,6 +137,7 @@ files:
 - Rakefile
 - lib/pebbles/river.rb
 - lib/pebbles/river/compatibility.rb
+- lib/pebbles/river/errors.rb
 - lib/pebbles/river/message.rb
 - lib/pebbles/river/river.rb
 - lib/pebbles/river/routing.rb