action_subscriber 3.0.0.pre1 → 3.0.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0a848297f91f557f43e6240545866aaad495d17
-  data.tar.gz: 0fd512e453740a0ad0e34f1f42ddef7ab5ac240f
+  metadata.gz: f453f7e59eee1009c949b5e395359dc59b637c5f
+  data.tar.gz: 426ef40b324f3770306f790b3f03673905670a23
 SHA512:
-  metadata.gz: 6d30b59daffa7e89a4c48eb3044a65af90804d91b3c0991e3dd0899b9a20944532878bc6327684577d05c11b9017edfb233bbd251daa42dff9a50d614f4701da
-  data.tar.gz: df4cf38fe9cbfed26adcc53e43823348726176cc387ccaa46d22274099182198aa1c2d1fcd1c7e341d87dd6e4f1a88e24702788a41c9955e8a2161a880459d56
+  metadata.gz: b644cb531eacde80a9f7878fcfeb3c50925b70dc5bafdf3d753462a505883645e7bf81220e727aac99b399a82e9951df276676e9a12d20e903a22dd72132df65
+  data.tar.gz: 410c264a22022b14a2fe4a7a44674c184b982dcd9562b5e2966def02b12043ee3fe6f27387b139820f32e5cdd1e53edcc3d4af42b954d3e8a139c9ce5cad6af2

data/lib/action_subscriber/middleware/error_handler.rb

@@ -8,17 +8,26 @@ module ActionSubscriber
       end
 
       def call(env)
-        # This insulates the connection thread from errors that are raised by the error_handle or
-        # exceptions that don't fall under StandardError (which are not caught by `rescue => error`)
-        new_thread = ::Thread.new do
-          begin
-            @app.call(env)
-          rescue => error
-            logger.error "FAILED #{env.message_id}"
-            ::ActionSubscriber.configuration.error_handler.call(error, env.to_h)
+        job_mutex = ::Mutex.new
+        job_complete = ::ConditionVariable.new
+
+        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)
         end
-        ::Thread.pass while new_thread.alive?
       end
     end
   end

data/lib/action_subscriber/rabbit_connection.rb

@@ -13,13 +13,15 @@ module ActionSubscriber
     end
 
     def self.subscriber_connected?
-      subscriber_connections.all?{|_name, connection| connection.connected?}
+      SUBSCRIBER_CONNECTION_MUTEX.synchronize do
+        subscriber_connections.all?{|_name, connection| connection.connected?}
+      end
     end
 
     def self.subscriber_disconnect!
       SUBSCRIBER_CONNECTION_MUTEX.synchronize do
         subscriber_connections.each{|_name, connection| connection.close}
-        @subscriber_connections = []
+        @subscriber_connections = {}
       end
     end
 

data/lib/action_subscriber/router.rb

@@ -40,8 +40,9 @@ module ActionSubscriber
       ].compact.join(".")
     end
 
-    def default_routes_for(subscriber)
-      subscriber.routes({:connection_name => @current_connection_name}).each do |route|
+    def default_routes_for(subscriber, options = {})
+      options = options.merge({:connection_name => @current_connection_name})
+      subscriber.routes(options).each do |route|
         routes << route
       end
     end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "3.0.0.pre1"
+  VERSION = "3.0.0.pre2"
 end

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

@@ -19,4 +19,19 @@ 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

data/spec/spec_helper.rb

@@ -33,6 +33,7 @@ RSpec.configure do |config|
     ::ActionSubscriber.instance_variable_set("@route_set_block", nil)
   end
   config.after(:suite) do
+    ::ActionSubscriber.stop_subscribers!
     ::ActionSubscriber::RabbitConnection.subscriber_disconnect!
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 3.0.0.pre1
+  version: 3.0.0.pre2
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport