pebbles-river 0.1.5 → 0.1.6

data/lib/pebbles/river.rb

@@ -16,3 +16,15 @@ require_relative "river/river"
 require_relative "river/compatibility"
 require_relative "river/rate_limiter"
 require_relative "river/daemon_helper"
+
+module Pebbles::River
+
+  def self.rabbitmq_options
+    @rabbitmq_options ||= {}.freeze
+  end
+
+  def self.rabbitmq_options=(options)
+    @rabbitmq_options = options.freeze
+  end
+
+end

data/lib/pebbles/river/river.rb

@@ -20,9 +20,10 @@ module Pebbles
       end
 
       def connect
-        unless @session
+        unless @session and @channel and @exchange
+          disconnect
           handle_session_error do
-            session = Bunny::Session.new
+            session = Bunny::Session.new(::Pebbles::River.rabbitmq_options)
             session.start
 
             channel = session.create_channel
@@ -35,9 +36,12 @@ module Pebbles
       end
 
       def disconnect
-        @exchange = nil
         if @channel
-          @channel.close
+          begin
+            @channel.close
+          rescue *CONNECTION_EXCEPTIONS
+            # Ignore
+          end
           @channel = nil
         end
         if @session
@@ -48,12 +52,15 @@ module Pebbles
           end
           @session = nil
         end
+        @exchange = nil
       end
 
       def publish(options = {})
-        connect
         handle_session_error(SendFailure) do
-          exchange.publish(options.to_json,
+          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
@@ -62,8 +69,13 @@ module Pebbles
       def queue(options = {})
         raise ArgumentError.new 'Queue must be named' unless options[:name]
 
+        queue_opts = {durable: true}
+        if (ttl = options[:ttl])
+          queue_opts[:arguments] = {'x-message-ttl' => ttl}
+        end
+
         connect
-        queue = @channel.queue(options[:name], QUEUE_OPTIONS.dup)
+        queue = @channel.queue(options[:name], queue_opts)
         Subscription.new(options).queries.each do |key|
           queue.bind(exchange.name, key: key)
         end
@@ -89,6 +101,7 @@ module Pebbles
             begin
               yield
             rescue *CONNECTION_EXCEPTIONS => exception
+              disconnect
               last_exception = exception
               retry_count += 1
               backoff(retry_count)
@@ -108,16 +121,10 @@ module Pebbles
 
         MAX_BACKOFF_SECONDS = MAX_RETRY_TIMEOUT
 
-        QUEUE_OPTIONS = {durable: true}.freeze
-
         EXCHANGE_OPTIONS = {type: :topic, durable: :true}.freeze
 
         CONNECTION_EXCEPTIONS = [
-          Bunny::ConnectionError,
-          Bunny::ForcedChannelCloseError,
-          Bunny::ForcedConnectionCloseError,
-          Bunny::ServerDownError,
-          Bunny::ProtocolError,
+          Bunny::Exception,
           # These should be caught by Bunny, but apparently aren't.
           Errno::ECONNRESET
         ].freeze

data/lib/pebbles/river/supervisor.rb

@@ -30,8 +30,8 @@ module Pebbles
         end
       end
 
-      def add_listener(listener, queue_spec)
-        worker = Pebbles::River::Worker.new(listener,
+      def add_listener(listener, queue_spec, worker_options = {})
+        worker = Pebbles::River::Worker.new(listener, {
           queue: queue_spec,
           on_exception: ->(e) {
             if logger.respond_to?(:exception)
@@ -39,7 +39,8 @@ module Pebbles
             else
               logger.error("Exception #{e.class}: #{e} #{e.backtrace.join("\n")}")
             end
-          })
+          }
+        }.merge(worker_options))
 
         process_name = "#{@name}: queue worker: #{queue_spec[:name]}"
         logger = @logger

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

data/lib/pebbles/river/worker.rb

@@ -202,6 +202,7 @@ module Pebbles
           Bunny::ConnectionError,
           Bunny::ForcedChannelCloseError,
           Bunny::ForcedConnectionCloseError,
+          Bunny::ConnectionClosedError,
           Bunny::ServerDownError,
           Bunny::ProtocolError,
           # These should be caught by Bunny, but apparently aren't.

data/pebbles-river.gemspec

@@ -20,8 +20,8 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'pebblebed', '>= 0.2.1'
-  spec.add_runtime_dependency 'bunny', '~> 1.3.1'
+  spec.add_runtime_dependency 'pebblebed', '>= 0.2.2'
+  spec.add_runtime_dependency 'bunny', '~> 1.4.0'
   spec.add_runtime_dependency 'activesupport', '>= 3.0'
   spec.add_runtime_dependency 'servolux', '~> 0.10'
   spec.add_runtime_dependency 'mercenary', '~> 0.3.3'

data/spec/lib/river_spec.rb

@@ -13,6 +13,7 @@ describe Pebbles::River::River do
 
   CONNECTION_EXCEPTIONS = [
     Bunny::ConnectionError,
+    Bunny::ConnectionClosedError,
     Bunny::ForcedChannelCloseError,
     Bunny::ForcedConnectionCloseError,
     Bunny::ServerDownError,
@@ -100,7 +101,7 @@ describe Pebbles::River::River do
 
     CONNECTION_EXCEPTIONS.each do |exception_class|
       context "on temporary failure with #{exception_class}" do
-        it "retries sending until success" do
+        it "reconnects and retries sending until success" do
           exchange = double('exchange')
 
           count = 0
@@ -111,6 +112,7 @@ describe Pebbles::River::River do
             end
           end
 
+          subject.stub(:connect) { }
           subject.stub(:exchange) { exchange }
           subject.stub(:sleep) { }
           Timeout.stub(:timeout) { |&block|
@@ -119,10 +121,12 @@ describe Pebbles::River::River do
           expect(Timeout).to receive(:timeout).at_least(1).times
 
           expect(subject).to receive(:sleep).at_least(2).times
+          expect(subject).to receive(:connect).exactly(3).times
+          expect(subject).to receive(:disconnect).exactly(3).times
 
           expect(exchange).to receive(:publish).at_least(2).times
 
-          subject.publish({event: 'explode', uid: 'thing:rspec$1'})
+          subject.publish(event: 'explode', uid: 'thing:rspec$1')
         end
       end
     end
@@ -150,6 +154,8 @@ describe Pebbles::River::River do
           }
           expect(Timeout).to receive(:timeout).at_least(1).times
 
+          expect(subject).to receive(:disconnect).at_least(11).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

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,39 +10,44 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-19 00:00:00.000000000 Z
+date: 2014-09-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pebblebed
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.1
+        version: 0.2.2
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.4.0
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -49,6 +55,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -56,6 +63,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: servolux
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -63,6 +71,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,6 +79,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: mercenary
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -77,6 +87,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -84,6 +95,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -91,6 +103,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -98,6 +111,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -105,6 +119,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -112,6 +127,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -119,6 +135,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -126,6 +143,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -133,6 +151,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -170,26 +189,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Implements an event river mechanism for Pebblebed.
 test_files:
 - spec/lib/river_spec.rb
@@ -197,3 +217,4 @@ test_files:
 - spec/lib/subscription_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb
+has_rdoc: 

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    YTgxMDRiZWE4YzZhNzE0ZDM0YjNmM2ViNzY3NWNlMmJiMGRhNDgyZA==
-  data.tar.gz: !binary |-
-    NzdjZDZlM2IxY2RlZTM0MDdiYWQzNmE3NDQxYTY5YTY4ZWRkNTQ4Yg==
-SHA512:
-  metadata.gz: !binary |-
-    MDBmZjkzNmU0ZWYzMjNlNmIyODEyZWJmM2E4YjE1NjU3Mjk1NGM0M2U5N2Ex
-    YWQzZjYxNTI4NTk2MDU0Y2Q2YmIzM2E0YjA2NzZkOGZkYTZiMDdhNDI3NTdi
-    NjI1MDE4ODVmYTA0OWE0Zjg5MTg3NWY4Mjc0MWY0YmI5YTlmNGM=
-  data.tar.gz: !binary |-
-    MTUxNzljZmM0YzBlZDQ2OTcwOGViYjQwYTA3OTQ4YmNlYjViOTQ0MWVkYmVi
-    YjM2N2RmMTlhMzc1NWUxZTZlZjA0NTJlZjE0YmZiYzMzYTUyNDQxYzU5MDRl
-    ZjY1YjNjNGFiMjhiNjVhNmViZGExNzViMGFmODJjYTEwNWQ0NzY=