action_subscriber 4.4.0 → 4.5.0.pre0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46659405baa83f5d13af35a5c014ff900baf3cfb
-  data.tar.gz: c765ee1c9d142ead34a174ea520e6eb612bec05d
+  metadata.gz: 4ff445afc60cb441e3af5c2e9e65f13826fa02d8
+  data.tar.gz: 5346ff383fa7ebd1b0047cd9d5392e30ce492d4d
 SHA512:
-  metadata.gz: f7a3f0bd6b3225076fe4e0336596dfbf746b1a8b0896ab9f040cb0d6eda368e3d0008ad4c5e8cc7573823042351f468dfa83f611aae95d727e2f5caa4e053c65
-  data.tar.gz: ccc68611930161add63d253d2efd5460b8da17672247f24a7f6ccea9e1a7617e225e7d8ec8f897a77e1d839fa01a7ccfce6560e74b9d57e49b66927e56d31fb6
+  metadata.gz: 52b19ec1002942aa27c185aee22ec1a13d8e9ec1db7648db4c04621e8d3a8baa6aa66d82c7dcf6dcb6d1d5843f23e48ffe4d80c318004b256216c5695ef9861b
+  data.tar.gz: 13b671f299f909e1f05b8e81dc26c9f8be8957d511ab79d6fed98d5c3ba2b77c6b5337356d98d1e4af600dc6bf9be7ff661fc29e5cb1ee15ba6530f7c543758a

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"
+  VERSION = "4.5.0.pre0"
 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
+  version: 4.5.0.pre0
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-28 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -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: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.2