action_subscriber 2.4.0-java → 2.5.0.pre2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4f88273356427bd1dd6eb0a7193439582c4459a3
-  data.tar.gz: 1e7dbaf3d4910fa57f2827d9813f283b96f40b4c
+  metadata.gz: 2c6194a3af9eae1c2d4cf5334ac776096f8f2941
+  data.tar.gz: 688438729925400473d45c00ca9d721381ed659b
 SHA512:
-  metadata.gz: 0f22d17d74aa6ad323d72c531668e47e4b19d003ada7c4b4a2a315ad4c252a6336dc27aad123360939370da80b9f6fb10d4c5168da07d94eaaa7e9754a16151c
-  data.tar.gz: dc5dff440bc611ddbc5124baf8023ec44cc0cebf39c1127d32d66d9a836c61c27b266f6a21516987c4a578e09649b32764aaacddf0ca7e2bccb4cdd295308721
+  metadata.gz: dbfad9bf2929bc5e91fa5c17db51d8704bf26dcd63c6cbf90010043317d240cc48b1efa8ccf48f59c9c30b4aec0846dc8de9b5cc4cb33a3f4243ad7e2d37be91
+  data.tar.gz: c3d530b87d242352a5066f7ae91661ff0ea313556feccc4f40b5040367f703c33c4ac037160d9d47d4d09c995dc5e038307774451ffc72a4307f27e95454ebb0

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
 rvm:
- - 1.9
- - 2.0
- - 2.1
- - 2.2
- - jruby-1.7
+ - 2.2.4
+ - 2.3.0
  - jruby-9.0.4.0
+ - jruby-9.1.5.0
  - jruby-head
- - rbx-2
 services:
  - rabbitmq
 sudo: false
@@ -15,4 +12,3 @@ cache: bundler
 matrix:
   allow_failures:
     - rvm: jruby-head
-    - rvm: rbx-2

data/lib/action_subscriber.rb

@@ -27,6 +27,7 @@ require "action_subscriber/march_hare/subscriber"
 require "action_subscriber/babou"
 require "action_subscriber/publisher"
 require "action_subscriber/publisher/async"
+require "action_subscriber/synchronizer"
 require "action_subscriber/route"
 require "action_subscriber/route_set"
 require "action_subscriber/router"

data/lib/action_subscriber/base.rb

@@ -61,17 +61,73 @@ module ActionSubscriber
     end
 
     def _at_least_once_filter
+      processed_acknowledgement = false
       yield
-      acknowledge
+      processed_acknowledgement = acknowledge
     rescue => error
       ::ActionSubscriber::MessageRetry.redeliver_message_with_backoff(env)
-      acknowledge
+      processed_acknowledgement = acknowledge
       raise error
+    ensure
+      rejected_message = false
+      rejected_message = reject unless processed_acknowledgement
+
+      if !processed_acknowledgement && !rejected_message
+        Process.kill(:TTIN, Process.pid)
+        Process.kill(:USR2, Process.pid)
+
+        $stdout << <<-UNREJECTABLE
+          CANNOT ACKNOWLEDGE OR REJECT THE MESSAGE
+
+          This is a exceptional state for ActionSubscriber to enter and puts the current
+          Process in the position of "I can't get new work from RabbitMQ, but also
+          can't acknowledge or reject the work that I currently have" ... While rare
+          this state can happen.
+
+          Instead of continuing to try to process the message ActionSubscriber is
+          sending a Kill signal to the current running process to gracefully shutdown
+          so that the RabbitMQ server will purge any outstanding acknowledgements. If
+          you are running a process monitoring tool (like Upstart) the Subscriber
+          process will be restarted and be able to take on new work.
+
+          ** Running a process monitoring tool like Upstart is recommended for this reason **
+        UNREJECTABLE
+
+        Process.kill(:TERM, Process.pid)
+      end
     end
 
     def _at_most_once_filter
-      acknowledge
+      processed_acknowledgement = false
+      processed_acknowledgement = acknowledge
       yield
+    ensure
+      rejected_message = false
+      rejected_message = reject unless processed_acknowledgement
+
+      if !processed_acknowledgement && !rejected_message
+        Process.kill(:TTIN, Process.pid)
+        Process.kill(:USR2, Process.pid)
+
+        $stdout << <<-UNREJECTABLE
+          CANNOT ACKNOWLEDGE OR REJECT THE MESSAGE
+
+          This is a exceptional state for ActionSubscriber to enter and puts the current
+          Process in the position of "I can't get new work from RabbitMQ, but also
+          can't acknowledge or reject the work that I currently have" ... While rare
+          this state can happen.
+
+          Instead of continuing to try to process the message ActionSubscriber is
+          sending a Kill signal to the current running process to gracefully shutdown
+          so that the RabbitMQ server will purge any outstanding acknowledgements. If
+          you are running a process monitoring tool (like Upstart) the Subscriber
+          process will be restarted and be able to take on new work.
+
+          ** Running a process monitoring tool like Upstart is recommended for this reason **
+        UNREJECTABLE
+
+        Process.kill(:TERM, Process.pid)
+      end
     end
 
     def reject

data/lib/action_subscriber/bunny/subscriber.rb

@@ -11,6 +11,10 @@ module ActionSubscriber
         bunny_consumers.each(&:cancel)
       end
 
+      def create_queue(channel, queue_name, queue_options)
+        ::Bunny::Queue.new(channel, queue_name, queue_options)
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker

data/lib/action_subscriber/march_hare/subscriber.rb

@@ -7,6 +7,12 @@ module ActionSubscriber
         march_hare_consumers.each(&:cancel)
       end
 
+      def create_queue(channel, queue_name, queue_options)
+        queue = ::MarchHare::Queue.new(channel, queue_name, queue_options)
+        queue.declare!
+        queue
+      end
+
       def auto_pop!
         # Because threadpools can be large we want to cap the number
         # of times we will pop each time we poll the broker

data/lib/action_subscriber/middleware/env.rb

@@ -43,11 +43,13 @@ module ActionSubscriber
       def acknowledge
         acknowledge_multiple_messages = false
         @channel.ack(@delivery_tag, acknowledge_multiple_messages)
+        true
       end
 
       def reject
         requeue_message = true
         @channel.reject(@delivery_tag, requeue_message)
+        true
       end
 
       def to_hash

data/lib/action_subscriber/route_set.rb

@@ -26,8 +26,14 @@ module ActionSubscriber
 
     def setup_queue(route)
       channel = ::ActionSubscriber::RabbitConnection.subscriber_connection.create_channel
+      # Make channels threadsafe again! Believe Me!
+      # Accessing channels from multiple threads for messsage acknowledgement will crash
+      # a channel and stop messages from being received on that channel
+      # this isn't very clear in the documentation for march_hare/bunny, but it is
+      # explicitly addresses here: https://github.com/rabbitmq/rabbitmq-java-client/issues/53
+      channel = ::ActionSubscriber::Synchronizer.new(channel)
       exchange = channel.topic(route.exchange)
-      queue = channel.queue(route.queue, :durable => route.durable)
+      queue = create_queue(channel, route.queue, :durable => route.durable)
       queue.bind(exchange, :routing_key => route.routing_key)
       queue
     end

data/lib/action_subscriber/synchronizer.rb

@@ -0,0 +1,15 @@
+require "thread"
+module ActionSubscriber
+  class Synchronizer
+    def initialize(delegate)
+      @delegate = delegate
+      @mutex = ::Mutex.new
+    end
+
+    def method_missing(name, *args, &block)
+      @mutex.synchronize do
+        @delegate.public_send(name, *args, &block)
+      end
+    end
+  end
+end

data/lib/action_subscriber/version.rb

@@ -1,3 +1,3 @@
 module ActionSubscriber
-  VERSION = "2.4.0"
+  VERSION = "2.5.0.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.5.0.pre2
 platform: java
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -223,6 +223,7 @@ files:
 - lib/action_subscriber/router.rb
 - lib/action_subscriber/rspec.rb
 - lib/action_subscriber/subscribable.rb
+- lib/action_subscriber/synchronizer.rb
 - lib/action_subscriber/threadpool.rb
 - lib/action_subscriber/uri.rb
 - lib/action_subscriber/version.rb
@@ -271,12 +272,12 @@ 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.0
+rubygems_version: 2.6.6
 signing_key:
 specification_version: 4
 summary: ActionSubscriber is a DSL that allows a rails app to consume messages from a RabbitMQ broker.