pebbles-river 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c159209a9e608dd1d740057e03daea124c650de
-  data.tar.gz: eae176e284a91579da4b4cdd4e06c202080d4c52
+  metadata.gz: c514b0f819ee4aa389d5abaca35f3dcdc8fecd5b
+  data.tar.gz: dcbbe1d18db737bd37e88a919cf5597d7f671f92
 SHA512:
-  metadata.gz: 2799e6e6946b0b17b3c5722008e4a1c70365b3e00eae8b9fefeaa83bb213eaf864d2934591c2f49b08103998069c62167693fd54699068aea4b688aaef4e909c
-  data.tar.gz: e658cad4bb8ec8d75235915188eda161613fdef638ae5e321f50686c8d112bf43500878a815f1f90fb33366bce6fa48b0ec6b12e49f8dd539b042e1d1c40311c
+  metadata.gz: 7880c624a3e71b2cf73f17d13f8eb9b8be74adc5dbea419302c3ede4119892848643c72b09e217099128c7442aa0a132c1529923f9f782451bee2b01df925221
+  data.tar.gz: 1d5c924d2fb50c934b656b493e6db0cdc1a126ab043e9b8aced0560713562fb09d94caaec151bd4bf8ccf326e17062ead056d3b00f2cb631be7feb572d615a81

data/lib/pebbles/river/river.rb

@@ -30,15 +30,14 @@ module Pebbles
       def connect
         unless @session and @channel and @exchange
           disconnect
-          handle_session_error do
-            @session = Bunny::Session.new(::Pebbles::River.rabbitmq_options)
-            @session.start
 
-            @channel = @session.create_channel
-            @channel.prefetch(@prefetch) if @prefetch
+          @session = Bunny::Session.new(::Pebbles::River.rabbitmq_options)
+          @session.start
 
-            @exchange = @channel.exchange(@exchange_name, EXCHANGE_OPTIONS.dup)
-          end
+          @channel = @session.create_channel
+          @channel.prefetch(@prefetch) if @prefetch
+
+          @exchange = @channel.exchange(@exchange_name, EXCHANGE_OPTIONS.dup)
         end
       end
 
@@ -63,14 +62,12 @@ module Pebbles
       end
 
       def publish(options = {})
-        handle_session_error(SendFailure) do
-          connect
+        connect
 
-          # Note: Using self.exchange so it can be stubbed in tests
-          self.exchange.publish(options.to_json,
-            persistent: options.fetch(:persistent, true),
-            key: Routing.routing_key_for(options.slice(:event, :uid)))
-        end
+        # Note: Using self.exchange so it can be stubbed in tests
+        self.exchange.publish(options.to_json,
+          persistent: options.fetch(:persistent, true),
+          key: Routing.routing_key_for(options.slice(:event, :uid)))
       end
 
       def queue(options = {})
@@ -104,31 +101,6 @@ module Pebbles
 
       private
 
-        def handle_session_error(exception_klass = ConnectFailure, &block)
-          last_exception = nil
-          Timeout.timeout(MAX_RETRY_TIMEOUT) do
-            retry_count = 0
-            begin
-              yield
-            rescue Bunny::Exception => e
-              disconnect
-              last_exception = e
-              retry_count += 1
-              backoff(retry_count)
-              retry
-            end
-          end
-        rescue Timeout::Error => timeout_exception
-          # Timeouts can screw up the connection, so forcibly close it
-          disconnect
-
-          if last_exception
-            raise exception_klass.new(last_exception.message, last_exception)
-          else
-            raise exception_klass.new("Timeout", timeout_exception)
-          end
-        end
-
         def backoff(iteration)
           sleep([(1.0 / 2.0 * (2.0 ** [30, iteration].min - 1.0)).ceil, MAX_BACKOFF_SECONDS].min)
         end

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.3.6'
+    VERSION = '0.3.7'
   end
 end

data/spec/lib/river_spec.rb

@@ -89,28 +89,6 @@ describe Pebbles::River::River do
       JSON.parse(payload)['uid'].should eq('klass:path$1')
     end
 
-    context 'on connection timeout' do
-      it "gives up with SendFailure" do
-        exchange = double('exchange')
-        exchange.stub(:publish) { }
-
-        subject.stub(:exchange) { exchange }
-
-        Timeout.stub(:timeout) { |&block|
-          raise Timeout::Error, "execution expired"
-        }
-        expect(Timeout).to receive(:timeout).exactly(1).times
-
-        expect(-> {
-          subject.publish({event: 'explode', uid: 'thing:rspec$1'})
-        }).to raise_error do |e|
-          expect(e).to be_instance_of Pebbles::River::SendFailure
-          expect(e.message).to eq 'Timeout'
-          expect(e.connection_exception.class).to eq Timeout::Error
-        end
-      end
-    end
-
   end
 
   it "subscribes" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-01 00:00:00.000000000 Z
+date: 2017-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Implements an event river mechanism for Pebblebed.
@@ -194,4 +194,3 @@ test_files:
 - spec/lib/routing_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: