action_subscriber 3.0.0.pre1-java → 3.0.0.pre2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d9345303246c9e2b28d3169a40a0245460dddad
-  data.tar.gz: 1c11f93bac81ae81db2c99e4d317cf63eddd732b
+  metadata.gz: 65fce1739063a1cf33dba2d29452a76add18ea96
+  data.tar.gz: 75d402b7e378ae9cf3d1eae35e694ffc23f4373c
 SHA512:
-  metadata.gz: fda6c938b37ef37526bb0a77b735ee65c312c9a586622b5784aa41b9c3b3fcca67b4ff80ae9bcaae9b25d12f85ac89299215cc01916f80f5cb5c6d5aec1289c1
-  data.tar.gz: 442d7cd524e4f9f41f262e606b4d3ed5cfd719ea1a25f2f60fffb0b6c6cacaf69b82f49f4d45b1e6d99a230a967b9576d2adcaf051faec89972a3d0003c5924c
+  metadata.gz: 7a7fa9c4143d3eef353301118acda43ca49b9c6bc7a07a846bc75e100aa6eefb926e31b8934b146dddb49bac572b9a2c74c3dcb860cc1cb23ddaa6c5fadd7ec6
+  data.tar.gz: 5861f99195162aec8d18c4d436f65f0ffda7a3e9438175218568770eaf17f54a00f1202fef76d661661a237b4375d5055e8fcb24634c509b2189e0e58a867951

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: java
 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
   requirement: !ruby/object:Gem::Requirement