pwwka 0.13.0.RC1 → 0.13.0.RC2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c804b87530f9d0b29e22b2a10131c8e7ef122cf2
-  data.tar.gz: 0a7b10536a20463505d055ac9797664320a58dbf
+  metadata.gz: dd8463f1ae68bd33512f90d6dc9925bd78475d4c
+  data.tar.gz: f1b8197403748e2c5e56fcc206246508d03b5ab4
 SHA512:
-  metadata.gz: 3c68568f681edce5f795676d3ed340f1d2ae5f52f333c1546c967cc3fa788f71b568b7abfe94b670013c825f0a8cbe8b6399574e9ebc7eddaada252c98f045fc
-  data.tar.gz: 0b61ce8f1fa5c070d11f09b41cf494aaa4e3e32a1793395f498237dfea94feedc267f449ce4b6a31d97bc0fd34592e029cd4b89c4e24849f534fbd28542998b3
+  metadata.gz: 5a65a393afb21da57d4e7039a383cae9db6631d1e06eca582d522b854b18a689fc2a605bd9b444331619c05d9b6a05653e36fe3bbb71a406b6b9f210b34e165c
+  data.tar.gz: e1bc690879b66874219c42a98129588d33ab6f8cb1df4e30bc6a04b23238df8f493c4fb796baf03d718617141233692034de6cd5563986073400ab53cf3dd77b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    pwwka (0.13.0.RC1)
+    pwwka (0.13.0.RC2)
       activemodel
       activesupport
       bunny

data/lib/pwwka/configuration.rb

@@ -15,15 +15,6 @@ module Pwwka
     attr_writer   :app_id
     attr_writer   :error_handling_chain
 
-    def keep_alive_on_handler_klass_exceptions=(val)
-      @keep_alive_on_handler_klass_exceptions = val
-      @error_handling_chain = nil
-    end
-    def requeue_on_error=(val)
-      @requeue_on_error = val
-      @error_handling_chain = nil
-    end
-
     def initialize
       @rabbit_mq_host        = nil
       @topic_exchange_name   = "pwwka.topics.#{Pwwka.environment}"
@@ -85,5 +76,28 @@ module Pwwka
                                 end
     end
 
+    def keep_alive_on_handler_klass_exceptions=(val)
+      @keep_alive_on_handler_klass_exceptions = val
+      if @keep_alive_on_handler_klass_exceptions
+        @error_handling_chain.delete(Pwwka::ErrorHandlers::Crash)
+      elsif !@error_handling_chain.include?(Pwwka::ErrorHandlers::Crash)
+        @error_handling_chain << Pwwka::ErrorHandlers::Crash
+      end
+    end
+
+    def requeue_on_error=(val)
+      @requeue_on_error = val
+      if @requeue_on_error
+        index = error_handling_chain.index(Pwwka::ErrorHandlers::NackAndIgnore)
+        if index
+          @error_handling_chain[index] = Pwwka::ErrorHandlers::NackAndRequeueOnce
+        end
+      else
+        index = error_handling_chain.index(Pwwka::ErrorHandlers::NackAndRequeueOnce)
+        if index
+          @error_handling_chain[index] = Pwwka::ErrorHandlers::NackAndIgnore
+        end
+      end
+    end
   end
 end

data/lib/pwwka/version.rb

@@ -1,3 +1,3 @@
 module Pwwka
-  VERSION = '0.13.0.RC1'
+  VERSION = '0.13.0.RC2'
 end

data/spec/integration/unhandled_errors_in_receivers_spec.rb

@@ -8,6 +8,7 @@ describe "receivers with unhandled errors", :integration do
 
   before do
     @testing_setup = IntegrationTestSetup.new
+    Pwwka.configuration.instance_variable_set("@error_handling_chain",nil)
     Pwwka.configure do |c|
       c.requeue_on_error = false
       c.keep_alive_on_handler_klass_exceptions = false

data/spec/unit/configuration_spec.rb

@@ -79,4 +79,44 @@ describe Pwwka::Configuration do
       end
     end
   end
+
+  describe "#error_handling_chain" do
+    before do
+      configuration.instance_variable_set("@error_handling_chain",nil)
+    end
+    context "implicit configuration" do
+      context "when requeue_on_error" do
+        context "when keep_alive_on_handler_klass_exceptions" do
+          it "is NackAndRequeueOnce" do
+            configuration.requeue_on_error = true
+            configuration.keep_alive_on_handler_klass_exceptions = true
+            expect(configuration.error_handling_chain).to eq([Pwwka::ErrorHandlers::NackAndRequeueOnce])
+          end
+        end
+        context "when not keep_alive_on_handler_klass_exceptions" do
+          it "is NackAndRequeueOnce,Crash" do
+            configuration.requeue_on_error = true
+            configuration.keep_alive_on_handler_klass_exceptions = false
+            expect(configuration.error_handling_chain).to eq([Pwwka::ErrorHandlers::NackAndRequeueOnce,Pwwka::ErrorHandlers::Crash])
+          end
+        end
+      end
+      context "when not requeue_on_error" do
+        context "when keep_alive_on_handler_klass_exceptions" do
+          it "is NackAndIgnore" do
+            configuration.requeue_on_error = false
+            configuration.keep_alive_on_handler_klass_exceptions = true
+            expect(configuration.error_handling_chain).to eq([Pwwka::ErrorHandlers::NackAndIgnore])
+          end
+        end
+        context "when not keep_alive_on_handler_klass_exceptions" do
+          it "is NackAndIgnore,Crash" do
+            configuration.requeue_on_error = false
+            configuration.keep_alive_on_handler_klass_exceptions = false
+            expect(configuration.error_handling_chain).to eq([Pwwka::ErrorHandlers::NackAndIgnore,Pwwka::ErrorHandlers::Crash])
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwwka
 version: !ruby/object:Gem::Version
-  version: 0.13.0.RC1
+  version: 0.13.0.RC2
 platform: ruby
 authors:
 - Stitch Fix Engineering