eventq_rabbitmq 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 946b28e0082401c207256c4667ad000b13ca903c
-  data.tar.gz: f9ba042df4f4006fa738236942fbfa978bf3543b
+  metadata.gz: c2f9d3d90c02d532c784c42bbca3bf36eba741d9
+  data.tar.gz: 981cd38e2de71431bb9a8a62295ac85fee2a1521
 SHA512:
-  metadata.gz: 4f255156fce8128b423ce85a15864dde3be27a501609c33d12a8e450bc33f16467999e2524ca051b1cee5c2906647e3d2b4a2aa9d3f0e21ae0ba6f66d15ecf90
-  data.tar.gz: 0497018d781c5f5e99c17bc8c3c1f76caca0982fba2763d09a1ad4ff2a630151ba0516c66a1683f000fb4b34c4042cf18b51beca5507ded7038fffa3ce255c3e
+  metadata.gz: fb5555b42b898c01d1f7f2dd8719ace503d0b6440f3eecf9a953bd2cc3740a9b11b4e83eacd31594331173f52b9a855815860df42a3525d624abc1572cfdafc1
+  data.tar.gz: 00051d1cd3963a8ed9aee720c72946565fbdb3ea75cc208f10bd8115c4e1c487291e25535ace8f7e4f315aebb678e5b2dfbd0ffa316879494a5e45ab1d33a29c

data/lib/eventq_rabbitmq/rabbitmq_queue_manager.rb

@@ -34,7 +34,21 @@ module EventQ
 
       def get_retry_queue(channel, queue)
         subscriber_exchange = get_subscriber_exchange(channel, queue)
-        return channel.queue("#{queue.name}.r", :durable => true, :arguments => { "x-dead-letter-exchange" => subscriber_exchange.name, "x-message-ttl" => queue.retry_delay })
+
+        if queue.allow_retry_back_off == true
+
+          EventQ.log(:debug, "[#{self.class}] - Requesting retry queue. x-dead-letter-exchange: #{subscriber_exchange.name} | x-message-ttl: #{queue.max_retry_delay}")
+
+          return channel.queue("#{queue.name}.r", :durable => true, :arguments => { "x-dead-letter-exchange" => subscriber_exchange.name, "x-message-ttl" => queue.max_retry_delay })
+
+        else
+
+          EventQ.log(:debug, "[#{self.class}] - Requesting retry queue. x-dead-letter-exchange: #{subscriber_exchange.name} | x-message-ttl: #{queue.retry_delay}")
+
+          return channel.queue("#{queue.name}.r", :durable => true, :arguments => { "x-dead-letter-exchange" => subscriber_exchange.name, "x-message-ttl" => queue.retry_delay })
+
+        end
+
       end
 
       def get_exchange(channel, exchange)

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -13,7 +13,7 @@ module EventQ
 
       def start(queue, options = {}, &block)
 
-        EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Preparing to start listening for messages.'
+        EventQ.log(:info, "[#{self.class}] - Preparing to start listening for messages.")
 
         configure(queue, options)
 
@@ -23,7 +23,7 @@ module EventQ
           raise ':client (QueueClient) must be specified.'
         end
 
-        EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Listening for messages.'
+        EventQ.log(:info, "[#{self.class}] - Listening for messages.")
 
         @is_running = true
         @threads = []
@@ -33,7 +33,7 @@ module EventQ
           thr = Thread.new do
 
             client = options[:client]
-            manager = QueueManager.new
+            manager = EventQ::RabbitMq::QueueManager.new
 
             #begin the queue loop for this thread
             while true do
@@ -61,7 +61,7 @@ module EventQ
 
                   message = Oj.load(payload)
 
-                  EventQ.logger.debug "[EVENTQ_RABBITMQ::QUEUE_WORKER] - Message received. Retry Attempts: #{message.retry_attempts}"
+                  EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
 
                   message_args = EventQ::MessageArgs.new(message.type, message.retry_attempts)
 
@@ -71,16 +71,16 @@ module EventQ
 
                     if message_args.abort == true
                       abort = true
-                      EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Message aborted.'
+                      EventQ.log(:debug, "[#{self.class}] - Message aborted.")
                     else
                       #accept the message as processed
                       channel.acknowledge(delivery_info.delivery_tag, false)
-                      EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Message acknowledged.'
+                      EventQ.log(:debug, "[#{self.class}] - Message acknowledged.")
                       received = true
                     end
 
                   rescue => e
-                    EventQ.logger.error "[EVENTQ_RABBITMQ::QUEUE_WORKER] - An unhandled error happened attempting to process a queue message. Error: #{e}"
+                    EventQ.log(:error, "[#{self.class}] - An unhandled error happened attempting to process a queue message. Error: #{e}")
 
                     error = true
 
@@ -93,14 +93,14 @@ module EventQ
                 end
 
               rescue Timeout::Error
-                EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Timeout occurred attempting to pop a message from the queue.'
+                EventQ.log(:debug, "[#{self.class}] - Timeout occurred attempting to pop a message from the queue.")
               end
 
               channel.close
 
               #check if any message was received
               if !received && !error
-                EventQ.logger.debug "[EVENTQ_RABBITMQ::QUEUE_WORKER] - No message received. Sleeping for #{@sleep} seconds"
+                EventQ.log(:debug, "[#{self.class}] - No message received. Sleeping for #{@sleep} seconds")
                 #no message received so sleep before attempting to pop another message from the queue
                 sleep(@sleep)
               end
@@ -121,7 +121,7 @@ module EventQ
       end
 
       def stop
-        EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Stopping.'
+        EventQ.log(:info, "[#{self.class}] - Stopping.")
         @is_running = false
         @threads.each { |thr| thr.join }
         return true
@@ -142,24 +142,44 @@ module EventQ
         #reject the message to remove from queue
         channel.reject(delivery_info.delivery_tag, false)
 
-        EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Message rejected.'
+        EventQ.log(:debug, "[#{self.class}] - Message rejected.")
 
         #check if the message is allowed to be retried
         if queue.allow_retry
 
-          EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Checking retry attempts...'
+          EventQ.log(:debug, "[#{self.class}] - Checking retry attempts...")
 
           if message.retry_attempts < queue.max_retry_attempts
-            EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Incrementing retry attempts count.'
+            EventQ.log(:debug, "[#{self.class}] - Incrementing retry attempts count.")
             message.retry_attempts += 1
-            EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Sending message for retry.'
-            retry_exchange.publish(Oj.dump(message))
-            EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Published message to retry exchange.'
-          elsif @retry_exceeded_block != nil
-            EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - Executing retry exceeded block.'
-            @retry_exceeded_block.call(message)
+
+            if queue.allow_retry_back_off == true
+              EventQ.log(:debug, "[#{self.class}] - Calculating message back off retry delay. Attempts: #{message.retry_attempts} * Retry Delay: #{queue.retry_delay}")
+              message_ttl = message.retry_attempts * queue.retry_delay
+              if (message.retry_attempts * queue.retry_delay) > queue.max_retry_delay
+                EventQ.log(:debug, "[#{self.class}] - Max message back off retry delay reached.")
+                message_ttl = queue.max_retry_delay
+              end
+            else
+              EventQ.log(:debug, "[#{self.class}] - Setting fixed retry delay for message.")
+              message_ttl = queue.retry_delay
+            end
+
+            EventQ.log(:debug, "[#{self.class}] - Sending message for retry. Message TTL: #{message_ttl}")
+            retry_exchange.publish(Oj.dump(message), :expiration => message_ttl)
+            EventQ.log(:debug, "[#{self.class}] - Published message to retry exchange.")
+
           else
-            EventQ.logger.debug '[EVENTQ_RABBITMQ::QUEUE_WORKER] - No retry exceeded block specified.'
+
+            EventQ.log(:debug, "[#{self.class}] - Message retry attempts exceeded.")
+
+            if @retry_exceeded_block != nil
+              EventQ.log(:debug, "[#{self.class}] - Executing retry exceeded block.")
+              @retry_exceeded_block.call(message)
+            else
+              EventQ.log(:debug, "[#{self.class}] - No retry exceeded block specified.")
+            end
+
           end
 
         end
@@ -184,7 +204,7 @@ module EventQ
           @sleep = options[:sleep]
         end
 
-        EventQ.logger.debug "[EVENTQ_RABBITMQ::QUEUE_WORKER] - Configuring. Thread Count: #{@thread_count} | Interval Sleep: #{@sleep}."
+        EventQ.log(:info, "[#{self.class}] - Configuring. Thread Count: #{@thread_count} | Interval Sleep: #{@sleep}.")
 
         return true
 

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-03 00:00:00.000000000 Z
+date: 2016-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler