action_subscriber 4.4.0.pre2-java → 4.5.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6fe3e9f8efec05473fbfdf80470c830571a3fbf443791c4a1ba2b734b3180056
-  data.tar.gz: fd5f12b1e85d98e6d22583a42bf9f7e23c3b534f00ee60e13814107b3c049c39
+  metadata.gz: 2e5ccb8aef3395279c11bfafe6dcac47c88d653981dee2935b67234918978327
+  data.tar.gz: 3111f0950b69c540cf101c6d9ed9ded217d2d1f8c1d7fe808fbaf1ec5f106b2f
 SHA512:
-  metadata.gz: 3ae40be01a43d34bcfbf6c1529ade82c8a6bffd78780810a6a4b1a4218b10702247b3cbdae1cbbda78cbc9ca083d35f897e75efa9f95173ef80556991ad9599a
-  data.tar.gz: 7a1fcdd05959cc0bc1a2121f48ec5257f0d1826343fcbe21233fd23cadb2bb71588e6eed7570d61e3cad1aaaf76724ed358f3927fe04b9460c4156c30f2e7946
+  metadata.gz: 0d497d0bc6eeeffc3b5f06c159ae782a3767cf351f1e7542f79f98c04d4226230edcedfa25b668b3f3826a886b1ba707ba36050fa2cf6629e98f41da6a290c16
+  data.tar.gz: 3dac444e91c7bfb63aa77b5cff0c94c6ba1244d2e5669d6d7b4b1c5f974343087cc44f823cc4329738de16fc724f308a77cd751018b1838763435e655067a767

data/lib/action_subscriber/configuration.rb

@@ -85,7 +85,13 @@ module ActionSubscriber
         'text/plain' => lambda { |payload| payload.dup }
       }
 
-      self.error_handler = lambda { |error, env_hash| raise }
+      self.error_handler = lambda do |error, env_hash|
+        logger = ::ActionSubscriber::Logging.logger
+
+        logger.error(error.message)
+        logger.error(error.class.to_s)
+        logger.error(error.backtrace.join("\n")) if error.try(:backtrace) && error.backtrace.is_a?(::Array)
+      end
 
       DEFAULTS.each_pair do |key, value|
         self.__send__("#{key}=", value)

data/lib/action_subscriber/middleware/error_handler.rb

@@ -8,25 +8,18 @@ module ActionSubscriber
       end
 
       def call(env)
-        job_mutex = ::Mutex.new
-        job_complete = ::ConditionVariable.new
+        @app.call(env)
+      rescue => error
+        logger.error "FAILED #{env.message_id}"
 
-        job_mutex.synchronize do
-          ::Thread.new do
-            job_mutex.synchronize do
-              begin
-                @app.call(env)
-              rescue => error
-                logger.error "FAILED #{env.message_id}"
-                ::ActionSubscriber.configuration.error_handler.call(error, env.to_h)
-              ensure
-                job_complete.signal
-              end
-            end
-          end
-
-          # TODO we might want to pass a timeout to this wait so we can handle jobs that get frozen
-          job_complete.wait(job_mutex)
+        # There is more to this rescue than meets the eye. MarchHare's java library will rescue errors
+        # and attempt to close the channel with its default exception handler. To avoid this, we will
+        # stop errors right here. If you want to handle errors, you must do it in the error handler and
+        # it should not re-raise. As a bonus, not killing these threads is better for your runtime :).
+        begin
+          ::ActionSubscriber.configuration.error_handler.call(error, env.to_h)
+        rescue => error
+          logger.error "ActionSubscriber error handler raised error, but should never raise. Error: #{error}"
         end
       end
     end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "4.4.0.pre2"
+  VERSION = "4.5.0"
 end

data/spec/lib/action_subscriber/configuration_spec.rb

@@ -43,4 +43,21 @@ describe ::ActionSubscriber::Configuration do
       expect(subject.virtual_host).to eq("vhost")
     end
   end
+
+  describe "error_handler" do
+    let(:logger) { ::ActionSubscriber::Logging.logger }
+
+    it "by default logs the error" do
+      expect(logger).to receive(:error).with("I'm confused")
+      expect(logger).to receive(:error).with("ArgumentError")
+      # Lame way of looking for the backtrace.
+      expect(logger).to receive(:error).with(/\.rb/)
+
+      begin
+        fail ::ArgumentError, "I'm confused"
+      rescue => error
+        subject.error_handler.call(error, {})
+      end
+    end
+  end
 end

data/spec/lib/action_subscriber/middleware/error_handler_spec.rb

@@ -19,19 +19,4 @@ describe ActionSubscriber::Middleware::ErrorHandler do
       subject.call(env)
     end
   end
-
-  context "many concurrent threads" do
-    it "handles the race conditions without raising exceptions" do
-      no_op = lambda{ nil }
-      threads = 1.upto(100).map do
-        ::Thread.new do
-          ::Thread.current.abort_on_exception = true
-          100.times do
-            described_class.new(no_op).call(env)
-          end
-        end
-      end
-      threads.each(&:join)
-    end
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 4.4.0.pre2
+  version: 4.5.0
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -277,9 +277,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project:
 rubygems_version: 2.6.11