action_subscriber 5.2.0-java → 5.2.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f088a473b7415a63fcbd5813b5431bc0948e873a0e12d82f6d1868c1325c98c
-  data.tar.gz: b1c54dc689091437f55616fee572d8b01ca5683d713da6a757ecbaff4938434a
+  metadata.gz: bca78c71253cc0e0b3c8f4c7b2ba62bc9b98919b5f66f057f14e29b6d646aba4
+  data.tar.gz: 38e3d342e82a51bbfc07cc6f8cf48d273723553b0946b3d00802269ad0ddb783
 SHA512:
-  metadata.gz: 6c852bffa5ac11f671380872ca6a3f10f684dca1089739114c32111b0ea0ee847e26621928862315371ad25e6d8d3d23d39324bf291cb28e97ed7afde77e0cf7
-  data.tar.gz: f0c39acea0ec3513b4c910cf428bc31fb36763ec1fbb0f20ceb04396c8bf76fbd73b0d40d6039d13aa6571db7a4a3486f9d01d94f90b3c180cbb6930fb2dda96
+  metadata.gz: c4beea316e1c5f47b62ee9d49a450fd47c1b166e426cbdb625d96e198e2b995d76682144857ef62b114dafea062001b6bd329598b8830950980c8d0733ed3ebc
+  data.tar.gz: 1f6daf1342da85dca5c9b19054c4d801cc0c94781fe36cd4a1bbdbafb13901d9b827ae18b60677a0b2528b39eca06a2b984eb38083d4f88ae83a0d77f51db076

data/lib/action_subscriber/rabbit_connection.rb

@@ -30,9 +30,22 @@ module ActionSubscriber
           ::MarchHare::ThreadPools.fixed_of_size(options[:threadpool_size])
         end
         connection = ::MarchHare.connect(options)
+        connection.on_blocked do |reason|
+          on_blocked(reason)
+        end
+        connection.on_unblocked do
+          on_unblocked
+        end
+        connection
       else
         connection = ::Bunny.new(options)
         connection.start
+        connection.on_blocked do |blocked_message|
+          on_blocked(blocked_message.reason)
+        end
+        connection.on_unblocked do
+          on_unblocked
+        end
         connection
       end
     end
@@ -59,5 +72,15 @@ module ActionSubscriber
       }
     end
     private_class_method :connection_options
+
+    def self.on_blocked(reason)
+      ::ActiveSupport::Notifications.instrument("connection_blocked.action_subscriber", :reason => reason)
+    end
+    private_class_method :on_blocked
+
+    def self.on_unblocked
+      ::ActiveSupport::Notifications.instrument("connection_unblocked.action_subscriber")
+    end
+    private_class_method :on_unblocked
   end
 end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "5.2.0"
+  VERSION = "5.2.1"
 end

data/spec/lib/action_subscriber/rabbit_connection_spec.rb

@@ -0,0 +1,63 @@
+require "spec_helper"
+
+describe ::ActionSubscriber::RabbitConnection do
+  let(:reason) { "low on disk" }
+
+  before { ActionSubscriber.draw_routes {} }
+
+  context "on_block" do
+    if ::RUBY_PLATFORM == "java"
+      def trigger_mocked_blocking_event(connection, reason)
+        amqp_message = ::Java::ComRabbitmqClient::AMQP::Connection::Blocked::Builder.new.
+          reason(reason).build
+        amq_command = ::Java::ComRabbitmqClientImpl::AMQCommand.new(amqp_message)
+
+        connection.send(:processControlCommand, amq_command)
+      end
+    else
+      def trigger_mocked_blocking_event(connection, reason)
+        connection.send(:handle_frame, 0, ::AMQ::Protocol::Connection::Blocked.new(reason))
+      end
+    end
+
+    it "can deliver an on_blocked message" do
+      expect(::ActiveSupport::Notifications).to receive(:instrument).
+        with("connection_blocked.action_subscriber", :reason => reason)
+
+      described_class.with_connection do |connection|
+        # NOTE: Trigger the receiving of a blocked message from the broker.
+        # It's a bit of a hack but it is a more realistic test without changing
+        # memory alarms.
+        trigger_mocked_blocking_event(connection, reason)
+      end
+    end
+  end
+
+  context "on_unblocked" do
+    if ::RUBY_PLATFORM == "java"
+      def trigger_mocked_unblocked_event(connection, reason)
+        amqp_message = ::Java::ComRabbitmqClient::AMQP::Connection::Unblocked::Builder.new.
+          build
+        amq_command = ::Java::ComRabbitmqClientImpl::AMQCommand.new(amqp_message)
+
+        connection.send(:processControlCommand, amq_command)
+      end
+    else
+      def trigger_mocked_unblocked_event(connection, reason)
+        connection.send(:handle_frame, 0, ::AMQ::Protocol::Connection::Unblocked.new)
+      end
+    end
+
+    it "can deliver an on_unblocked message" do
+      expect(::ActiveSupport::Notifications).to receive(:instrument).
+        with("connection_unblocked.action_subscriber")
+
+      described_class.with_connection do |connection|
+        # NOTE: Trigger the receiving of an unblocked message from the broker.
+        # It's a bit of a hack but it is a more realistic test without changing
+        # memory alarms.
+        trigger_mocked_unblocked_event(connection, reason)
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-15 00:00:00.000000000 Z
+date: 2020-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -273,6 +273,7 @@ files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
+- spec/lib/action_subscriber/rabbit_connection_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/spec_helper.rb
@@ -324,6 +325,7 @@ test_files:
 - spec/lib/action_subscriber/middleware/error_handler_spec.rb
 - spec/lib/action_subscriber/middleware/router_spec.rb
 - spec/lib/action_subscriber/middleware/runner_spec.rb
+- spec/lib/action_subscriber/rabbit_connection_spec.rb
 - spec/lib/action_subscriber/router_spec.rb
 - spec/lib/action_subscriber/subscribable_spec.rb
 - spec/spec_helper.rb