pebbles-river 0.0.5 → 0.0.6

data/lib/pebbles/river/version.rb

@@ -1,5 +1,5 @@
 module Pebbles
   module River
-    VERSION = '0.0.5'
+    VERSION = '0.0.6'
   end
 end

data/lib/pebbles/river/worker.rb

@@ -17,10 +17,10 @@ module Pebbles
       # Initializes worker with a handler. Options:
       #
       # * `queue`: Same queue options as `River#queue`.
-      # * `on_exception`: If provided, called when a message could not be handled
-      #   due to an exception.
-      # * `on_connection_error`: If provided, call on recovered connection errors.
-      #   Uses `on_exception` if not implemented.
+      # * `on_exception`: If provided, called with `exception` as an argument
+      #   when a message could not be handled due to an exception. (Connection
+      #   errors are not reported, however.)
+      # * `logger`: Optional logger. Defaults to stderr. Pass nil to disable.
       # * `managed_acking`: If true, ack/nack handling is automatic; every message
       #   is automatically acked unless the handler returns false or the handler
       #   raises an exception, in which case it's nacked. If false, the handler
@@ -34,8 +34,8 @@ module Pebbles
       def initialize(handler, options = {})
         options.assert_valid_keys(
           :queue,
+          :logger,
           :on_exception,
-          :on_connection_error,
           :managed_acking)
 
         unless handler.respond_to?(:call)
@@ -44,12 +44,12 @@ module Pebbles
 
         @queue_options = (options[:queue] || {}).freeze
         @managed_acking = !!options.fetch(:managed_acking, true)
-        @on_exception = options[:on_exception] || ->(e) { }
-        @on_connection_error = options[:on_connection_error] || @on_exception
+        @on_exception = options[:on_exception] || ->(*args) { }
         @handler = handler
         @river = River.new
         @next_event_time = Time.now
         @rate_limiter = RateLimiter.new(1.0, 10)
+        @logger = options.fetch(:logger, Logger.new($stderr))
       end
 
       # Runs the handler once.
@@ -163,6 +163,10 @@ module Pebbles
           begin
             yield
           rescue *CONNECTION_EXCEPTIONS => exception
+            if @logger
+              @logger.error("Connection error (#{exception.class}): #{exception}")
+            end
+
             @rate_limiter.increment
 
             if @queue
@@ -173,11 +177,11 @@ module Pebbles
             end
 
             @river.disconnect
-
-            ignore_exceptions do
-              @on_connection_error.call(exception)
-            end
           rescue => exception
+            if @logger
+              @logger.error("Exception (#{exception.class}) while handling message: #{exception}")
+            end
+
             @rate_limiter.increment
 
             ignore_exceptions do
@@ -188,8 +192,10 @@ module Pebbles
 
         def ignore_exceptions(&block)
           yield
-        rescue
-          # Ignore
+        rescue => e
+          if @logger
+            @logger.warn("Ignoring exception (#{e.class}): #{e}")
+          end
         end
 
         CONNECTION_EXCEPTIONS = [

data/spec/lib/worker_spec.rb

@@ -187,54 +187,91 @@ describe Worker do
         Bunny::ProtocolError,
         Errno::ECONNRESET
       ].each do |exception_class|
-        it "performs connection reset on #{exception_class}" do
-          expect(queue).to receive(:close).at_least(1).times
+        context "connection exception #{exception_class}" do
+          let :exception do
+            exception_class.new("Dangit")
+          end
 
-          handler = double('handler')
-          handler.stub(:call).and_return {
-            raise exception_class.new("Dangit")
-          }
-          expect(handler).to receive(:call).with(message)
+          let :handler do
+            handler = double('handler')
+            handler.stub(:call).and_return {
+              raise exception
+            }
+            handler
+          end
 
-          expect(river).to receive(:connected?).with(no_args).at_least(1).times
-          expect(river).to_not receive(:connect)
-          expect(river).to receive(:queue).with({name: 'foo'})
-          expect(river).to receive(:disconnect).at_least(1).times
+          it "performs connection reset on #{exception_class}" do
+            expect(queue).to receive(:close).at_least(1).times
 
-          subject.new(handler, queue: {name: 'foo'}).run_once
-        end
-      end
+            expect(handler).to receive(:call).with(message)
 
-      it "calls #on_connection_error if it's implemented" do
-        connection_error_handler = double('on_connection_error')
-        connection_error_handler.stub(:call) { }
-        expect(connection_error_handler).to receive(:call).with(connection_exception)
+            expect(river).to receive(:connected?).with(no_args).at_least(1).times
+            expect(river).to_not receive(:connect)
+            expect(river).to receive(:queue).with({name: 'foo'})
+            expect(river).to receive(:disconnect).at_least(1).times
 
-        expect(queue).to receive(:close).at_least(1).times
+            subject.new(handler, queue: {name: 'foo'}).run_once
+          end
 
-        erroring_handler = double('handler')
-        erroring_handler.stub(:call).and_return {
-          raise connection_exception
-        }
-        erroring_handler.stub(:on_connection_error).and_return(nil)
-        expect(erroring_handler).to receive(:call).with(message)
+          it "does not call #on_exception on connection error" do
+            on_exception_callback = double('on_connection_error')
+            on_exception_callback.stub(:call) { }
+            expect(on_exception_callback).to_not receive(:call)
 
-        expect(river).to receive(:connected?).with(no_args).at_least(1).times
-        expect(river).to_not receive(:connect)
-        expect(river).to receive(:disconnect).at_least(1).times
+            expect(queue).to receive(:close).at_least(1).times
+
+            expect(handler).to receive(:call).at_least(1).times
+
+            expect(river).to receive(:connected?).with(no_args).at_least(1).times
+            expect(river).to_not receive(:connect)
+            expect(river).to receive(:disconnect).at_least(1).times
+
+            subject.new(handler,
+              queue: {name: 'foo'},
+              on_exception: on_exception_callback).run_once
+          end
+
+          it "logs error to logger" do
+            expect(handler).to receive(:call).with(message)
+
+            logger = double('logger')
+            logger.stub(:error) { }
+            expect(logger).to receive(:error).
+              with(/#{Regexp.escape(exception.message)}/).at_least(1).times
 
-        subject.new(erroring_handler,
-          queue: {name: 'foo'},
-          on_connection_error: connection_error_handler).run_once
+            river.stub(:disconnect)
+
+            subject.new(handler,
+              queue: {name: 'foo'},
+              logger: logger).run_once
+          end
+        end
       end
 
-      it "calls #on_exception for non-connection errors" do
-        expect(queue).to_not receive(:close)
-        expect(on_exception_callback).to receive(:call).with(io_error)
+      context 'non-connection exception' do
+        it "calls #on_exception" do
+          expect(queue).to_not receive(:close)
+          expect(on_exception_callback).to receive(:call).with(io_error)
+
+          subject.new(io_error_raising_handler,
+            queue: {name: 'foo'},
+            on_exception: on_exception_callback).run_once
+        end
 
-        subject.new(io_error_raising_handler,
-          queue: {name: 'foo'},
-          on_exception: on_exception_callback).run_once
+        it "logs error to logger" do
+          on_exception_callback.stub(:call)
+
+          river.stub(:disconnect)
+
+          logger = double('logger')
+          logger.stub(:error) { }
+          expect(logger).to receive(:error).
+            with(/#{Regexp.escape(io_error.message)}/).at_least(1).times
+
+          subject.new(io_error_raising_handler,
+            queue: {name: 'foo'},
+            logger: logger).run_once
+        end
       end
 
     end

metadata

@@ -1,7 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: pebbles-river
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
+  prerelease: 
 platform: ruby
 authors:
 - Alexander Staubo
@@ -9,25 +10,28 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-22 00:00:00.000000000 Z
+date: 2014-05-29 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.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -35,6 +39,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -42,20 +47,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
 - !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,20 +79,23 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   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,29 +111,33 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Implements an event river mechanism for Pebblebed.
@@ -155,26 +172,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.0.3
+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
@@ -182,4 +200,3 @@ test_files:
 - spec/lib/subscription_spec.rb
 - spec/lib/worker_spec.rb
 - spec/spec_helper.rb
-has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 3a9d7fc14df9e1ff6e3ba421d3821b30e1bf44f6
-  data.tar.gz: 22387fcc520f21ca016f4b2ddff442202b94d5e0
-SHA512:
-  metadata.gz: 029b4e3683dcbed2cdebda4744199527a59c64513f22404d510f5a552788a708d159d4495d248e2d1b38c0d7c52bf2ed3e34b23fcb5c805cb846ee36a9318f0c
-  data.tar.gz: 6d5b93d2ed155f25c3220fd1c992d50c8c0425dd99785706c9a25f7ca728e0fb431df860ddf3557d5fa7e602ea36b2dfd93fcc7327aefd4c950e9c49c3d5346d