pwwka 0.15.0 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34728502586c650b28ce76b44de9e7038ae5b980
-  data.tar.gz: 8732f047a559e0feae6469c1d68d0267b9537757
+  metadata.gz: e2d3849c6e410b41770f48dcdcd6a3362ffb632c
+  data.tar.gz: 79c4b07513148802d9235c3606fcd176dd49ce71
 SHA512:
-  metadata.gz: 0cbb4d1b802b266e087adb0726ee3878c7f939ea4a920bc0f5a8044371437e7330b085a2a7382d8e85659442880723da35e691e4639e7f42473954994a4374bc
-  data.tar.gz: 67259184b9333de0cdb7df54d1f1b6a223ddf569932e1b3d574afac2d64eef8ee9d6b6006db1e405ce3a0ff9a71e7b22edd98aea38d4fa8e676bdfa3b5fa55be
+  metadata.gz: d69b7df9738dc5d3689158a9114316f2e9405287c6f35bbea725a6f2a77e298276f3a66462abf0366e12ac40b37042f2e75845bddc93a314b7663ede5dbfc0d1
+  data.tar.gz: 6d03c19a90c1db1e4bcd334abd23eb9d7d4ffa11ef7cedeb6446598d5099d80c8a2ec1c4e4b731dd477069287cd2865a6a637a7f7f4f7e69d649fee69ea8668c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pwwka (0.15.0)
+    pwwka (0.15.1)
       activemodel
       activesupport
       bunny

data/lib/pwwka/error_handlers/chain.rb

@@ -13,18 +13,23 @@ module Pwwka
           @error_handlers.unshift(message_handler_klass.send(:error_handler))
         end
         @error_handlers.reduce(true) { |keep_going,error_handler|
-          logf "%{error_handler_class} is being evaluated as part of pwwka's error-handling chain", error_handler_class: error_handler
-          if keep_going
-            keep_going = error_handler.new.handle_error(receiver,queue_name,payload,delivery_info,exception)
+          begin
+            logf "%{error_handler_class} is being evaluated as part of pwwka's error-handling chain", error_handler_class: error_handler
             if keep_going
-              logf "%{error_handler_class} has asked to continue pwwka's error-handling chain", error_handler_class: error_handler
+              keep_going = error_handler.new.handle_error(receiver,queue_name,payload,delivery_info,exception)
+              if keep_going
+                logf "%{error_handler_class} has asked to continue pwwka's error-handling chain", error_handler_class: error_handler
+              else
+                logf "%{error_handler_class} has halted pwwka's error-handling chain", error_handler_class: error_handler
+              end
             else
-              logf "%{error_handler_class} has halted pwwka's error-handling chain", error_handler_class: error_handler
+              logf "Skipping %{error_handler_class} as we were asked to abort pwwka's error-handling chain", error_handler_class: error_handler
             end
-          else
-            logf "Skipping %{error_handler_class} as we were asked to abort pwwka's error-handling chain", error_handler_class: error_handler
+            keep_going
+          rescue StandardError => exception
+            logf "'%{error_handler_class}' aborting due to unhandled exception '%{exception}'", at: :fatal, error_handler_class: error_handler, exception: exception
+            false
           end
-          keep_going
         }
       end
     end

data/lib/pwwka/version.rb

@@ -1,3 +1,3 @@
 module Pwwka
-  VERSION = '0.15.0'
+  VERSION = '0.15.1'
 end

data/spec/integration/unhandled_errors_in_receivers_spec.rb

@@ -5,6 +5,19 @@ require_relative "support/integration_test_setup"
 require_relative "support/logging_receiver"
 require_relative "support/integration_test_helpers"
 
+class PoorlyBehavingErrorHandler < Pwwka::ErrorHandlers::BaseErrorHandler
+  def handle_error(receiver,queue_name,payload,delivery_info,exception)
+    raise "whoops, do I break everything behind me?"
+    keep_going
+  end
+end
+
+class ErrorHandlerThatWorksFine < Pwwka::ErrorHandlers::BaseErrorHandler
+  def handle_error(receiver,queue_name,payload,delivery_info,exception)
+    keep_going
+  end
+end
+
 class EvilPayload
   def to_json
     "This is not JSON by any stretch"
@@ -167,6 +180,33 @@ describe "receivers with unhandled errors", :integration do
     end
   end
 
+  context "a custom error handler in the pwwka error handling chain throws its own exception" do
+    before do
+      @testing_setup.make_queue_and_setup_receiver(ExceptionThrowingReceiver,"exception_throwing_receiver_pwwkatesting","#")
+      ExceptionThrowingReceiver.reset!
+
+      Pwwka.configuration.instance_variable_set("@error_handling_chain",
+        [
+          PoorlyBehavingErrorHandler,
+          ErrorHandlerThatWorksFine
+        ])
+    end
+
+    after do
+      Pwwka.configuration.instance_variable_set("@error_handling_chain",nil)
+    end
+
+    it "confirms subsequent error handlers do not run when there is an exception earlier in the chain" do
+      Pwwka::Transmitter.send_message!({ sample: "payload", has: { deeply: true, nested: 4 }},
+                                       "pwwka.testing.foo")
+
+      allow_receivers_to_process_queues
+
+      expect(ExceptionThrowingReceiver.messages_received.size).to eq(1)
+      expect(@testing_setup.threads[ExceptionThrowingReceiver].alive?).to eq(true)
+    end
+  end
+
   def setup_receivers(exception_throwing_receiver_klass=ExceptionThrowingReceiver)
     [
       [exception_throwing_receiver_klass, "exception_throwing_receiver_pwwkatesting"],

data/spec/lib/pwwka/error_handlers/chain_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+
+describe Pwwka::ErrorHandlers::Chain do
+  subject(:chain) { described_class.new(default_handler_chain) }
+
+  describe "#handle_error" do
+    context "when an error handler raises an unhandled exception" do
+      let(:default_handler_chain) { [bad_error_handler_klass, good_error_handler_klass] }
+      let(:bad_error_handler_klass) { double("bad error handler klass", new: bad_error_handler) }
+      let(:bad_error_handler) {
+        handler = double("bad error handler")
+        allow(handler).to receive(:handle_error).and_raise("unhandled exception in error handler")
+        handler
+      }
+      let(:good_error_handler_klass) { double("good error handler klass") }
+
+      before { allow(bad_error_handler).to receive(:error_handler).and_raise("Wibble") }
+
+      it "does not run subsequent error handlers" do
+        expect(good_error_handler_klass).to_not receive(:new)
+
+        chain.handle_error(double,double,double,double,double,double.as_null_object)
+      end
+
+      it "logs exceptions that occur in the error handling chain" do
+        allow(chain.logger).to receive(:send).with(any_args)
+        expect(chain.logger).to receive(:send).with(:fatal, /aborting due to unhandled exception/)
+
+        chain.handle_error(double,double,double,double,double,double.as_null_object)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwwka
 version: !ruby/object:Gem::Version
-  version: 0.15.0
+  version: 0.15.1
 platform: ruby
 authors:
 - Stitch Fix Engineering
@@ -15,7 +15,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-30 00:00:00.000000000 Z
+date: 2017-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -237,6 +237,7 @@ files:
 - spec/legacy/receiver_spec.rb
 - spec/legacy/send_message_async_job_spec.rb
 - spec/legacy/transmitter_spec.rb
+- spec/lib/pwwka/error_handlers/chain_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_configuration.rb
 - spec/unit/channel_connector_spec.rb
@@ -267,7 +268,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Send and receive messages via RabbitMQ
@@ -283,6 +284,7 @@ test_files:
 - spec/legacy/receiver_spec.rb
 - spec/legacy/send_message_async_job_spec.rb
 - spec/legacy/transmitter_spec.rb
+- spec/lib/pwwka/error_handlers/chain_spec.rb
 - spec/spec_helper.rb
 - spec/support/test_configuration.rb
 - spec/unit/channel_connector_spec.rb