action_subscriber 5.0.3.pre1 → 5.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ca7cccf89023f06ddaa142cc7d9ad152857dff0
-  data.tar.gz: f8c77d9e20ec595946f9bb93e58b316007726ed0
+  metadata.gz: 605d2e8c1c46efca8695b90fdefca1b88342bc62
+  data.tar.gz: e6a8b84e0fa197c5e085251964f75a362b7d324b
 SHA512:
-  metadata.gz: e2b75379c1de445dfe3febfdd980b6fcbca36ec3b6ea968bda1f5f8c17deee0f2e1af98e51f5a0bcbf022041f47ba0621c8e7efc6885c46dc22e66e79e01a772
-  data.tar.gz: 26f142393ae73dcc8dbddd96150e65d87793265e9c4f9f42052e933de9b1a4c7f724d2994a939c938bde5081ec86fca8ca1315012ac54504057bb7dd5a6eba71
+  metadata.gz: d138a4b1709e7d0450b8a3c2cf85a9348ed4e4c8acbfbef61f69a9ea25beeba0fc88924ba46cc286a26ad527877d3b51a2b18dc0b5d3930033f3c1aedce5954a
+  data.tar.gz: 566f397bcdbfc28242451be5c6551dc6a013f8e1b7e36aac271ea1afe07ebfbd3ae14d5425f15af2a84645b6d2828a0e33830192f9b1dfd250c30e4823f303fa

data/lib/action_subscriber/dsl.rb

@@ -9,10 +9,9 @@ module ActionSubscriber
       !!@_at_least_once
     end
 
-    def at_most_once!(ack_every_n_messages = 1)
+    def at_most_once!
       @_acknowledge_messages = true
       @_at_most_once = true
-      @_ack_every_n_messages = ack_every_n_messages
     end
 
     def at_most_once?
@@ -55,10 +54,6 @@ module ActionSubscriber
       !!@_manual_acknowedgement
     end
 
-    def ack_every_n_messages
-      @_ack_every_n_messages || 1
-    end
-
     def no_acknowledgement!
       @_acknowledge_messages = false
     end
@@ -136,41 +131,6 @@ module ActionSubscriber
       end
     end
 
-    def _run_action_at_most_once_multiple_with_filters(env, action)
-      processed_acknowledgement = false
-      rejected_message = false
-      if env.delivery_tag % ack_every_n_messages == 0 # tags are monotonically increasing integers
-        processed_acknowledgement = env.acknowledge(true)
-      else
-        processed_acknowledgement = true # we are not acknowledging on this message and will wait for the offset to acknowledge
-      end
-
-      _run_action_with_filters(env, action)
-    ensure
-      rejected_message = env.reject if !processed_acknowledgement
-
-      if !rejected_message && !processed_acknowledgement
-        $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 _run_action_at_least_once_with_filters(env, action)
       processed_acknowledgement = false
       rejected_message = false
@@ -212,10 +172,8 @@ module ActionSubscriber
       case
       when at_least_once?
         _run_action_at_least_once_with_filters(env, action)
-      when at_most_once? && ack_every_n_messages <= 1 # Acknowledging every single message
+      when at_most_once?
         _run_action_at_most_once_with_filters(env, action)
-      when at_most_once? && ack_every_n_messages > 1 # Acknowledging messages in offset groups (every 10 messages or whatever the offset is)
-        _run_action_at_most_once_multiple_with_filters(env, action)
       else
         _run_action_with_filters(env, action)
       end

data/lib/action_subscriber/middleware/env.rb

@@ -7,7 +7,6 @@ module ActionSubscriber
 
       attr_reader :action,
                   :content_type,
-                  :delivery_tag,
                   :encoded_payload,
                   :exchange,
                   :headers,
@@ -41,8 +40,9 @@ module ActionSubscriber
         @subscriber = subscriber
       end
 
-      def acknowledge(acknowledge_multiple_messages = false)
+      def acknowledge
         fail ::RuntimeError, "you can't acknowledge messages under the polling API" unless @channel
+        acknowledge_multiple_messages = false
         @channel.ack(@delivery_tag, acknowledge_multiple_messages)
         true
       end

data/lib/action_subscriber/middleware/router.rb

@@ -8,9 +8,11 @@ module ActionSubscriber
       end
 
       def call(env)
-        logger.info "START #{env.message_id} #{env.subscriber}##{env.action}"
-        env.subscriber.run_action_with_filters(env, env.action)
-        logger.info "FINISHED #{env.message_id}"
+        logger.info { "START #{env.message_id} #{env.subscriber}##{env.action}" }
+        ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key, :queue => env.queue do
+          env.subscriber.run_action_with_filters(env, env.action)
+        end
+        logger.info { "FINISHED #{env.message_id}" }
       end
     end
   end

data/lib/action_subscriber/route_set.rb

@@ -23,11 +23,6 @@ module ActionSubscriber
           logger.info "    --       queue: #{route.queue}"
           logger.info "    -- routing_key: #{route.routing_key}"
           logger.info "    --    prefetch: #{route.prefetch}"
-          if subscriber.at_most_once? && (route.prefetch < subscriber.ack_every_n_messages || subscriber.ack_every_n_messages <= 0)
-            # https://www.rabbitmq.com/blog/2011/09/24/sizing-your-rabbits/
-            logger.error "ERROR Subscriber has ack_every_n_messages as #{subscriber.ack_every_n_messages} and route has prefetch as #{route.prefetch}"
-            fail "prefetch < ack_every_n_messages, deadlock will occur"
-          end
           if route.acknowledgements != subscriber.acknowledge_messages?
             logger.error "WARNING subscriber has acknowledgements as #{subscriber.acknowledge_messages?} and route has acknowledgements as #{route.acknowledgements}"
           end
@@ -63,10 +58,8 @@ module ActionSubscriber
 
     def run_env(env, threadpool)
       logger.info "RECEIVED #{env.message_id} from #{env.queue}"
-      ::ActiveSupport::Notifications.instrument "process_event.action_subscriber", :subscriber => env.subscriber.to_s, :routing_key => env.routing_key, :queue => env.queue do
-        threadpool << lambda do
-          ::ActionSubscriber.config.middleware.call(env)
-        end
+      threadpool << lambda do
+        ::ActionSubscriber.config.middleware.call(env)
       end
     end
   end

data/lib/action_subscriber/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_subscriber
 version: !ruby/object:Gem::Version
-  version: 5.0.3.pre1
+  version: 5.0.3
 platform: ruby
 authors:
 - Brian Stien
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-11 00:00:00.000000000 Z
+date: 2017-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -278,9 +278,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.13