eventq_rabbitmq 1.10.3 → 1.10.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc4a1cad923c9ffc801fcd8cb34d7e9a72e09f0d
-  data.tar.gz: e7db3536d2d51945b4f5471a055e73488799f157
+  metadata.gz: 1e56bd84cbee6f49b6dead60a68cb600092fa0e5
+  data.tar.gz: 7a08b8efdd47ead507c90649449a6599d095d224
 SHA512:
-  metadata.gz: 07f7b08a417978012a62b9ce6a63d86bd086d267fa398d2e12c07c3eef9c079e9afb6783509894ac0d8c74122d520a24d8f7aaadd29782e2ee526e9a7d27492f
-  data.tar.gz: bd154bd83cc3cd648b43ba447a4ad909c563bc041bab53df9226c63474fd667caecd2d984ef2eaeb2b9eddb64d292e88cb090000ebfff45fcd76143b25e32618
+  metadata.gz: 20709f9bd6255ecb6c50cc74e71bef1bffdb4ce00ffc23655abf4d537aaa2827dc8413a226fd78bff6ed2f5d817cb208c806d5a06acd958dde21b1624fd79338
+  data.tar.gz: 86049fb088de5e4103aa8a80d5b5838f281305217e8497170d0d9204cd67d638a043bd6ad38b3ac99dc676a1830e549a7f22e282b46fb3bb9b3761c6e932d880

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -105,8 +105,10 @@ module EventQ
 
               if !has_received_message
                 EventQ.log(:debug, "[#{self.class}] - No message received.")
-                EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
-                sleep(@sleep)
+                if @sleep > 0
+                  EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
+                  sleep(@sleep)
+                end
               end
 
             end
@@ -196,49 +198,45 @@ module EventQ
       end
 
       def reject_message(channel, message, delivery_info, retry_exchange, queue)
+
+        EventQ.log(:info, "[#{self.class}] - Message rejected removing from queue.")
         #reject the message to remove from queue
         channel.reject(delivery_info.delivery_tag, false)
 
-        EventQ.log(:info, "[#{self.class}] - Message rejected.")
-
-        #check if the message is allowed to be retried
-        if queue.allow_retry
-
-          EventQ.log(:debug, "[#{self.class}] - Checking retry attempts...")
-
-          if message.retry_attempts < queue.max_retry_attempts
-            EventQ.log(:debug, "[#{self.class}] - Incrementing retry attempts count.")
-            message.retry_attempts += 1
-
-            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
+        #check if the message retry limit has been exceeded
+        if message.retry_attempts >= queue.max_retry_attempts
 
-            EventQ.log(:debug, "[#{self.class}] - Sending message for retry. Message TTL: #{message_ttl}")
-            retry_exchange.publish(serialize_message(message), :expiration => message_ttl)
-            EventQ.log(:debug, "[#{self.class}] - Published message to retry exchange.")
+          EventQ.log(:info, "[#{self.class}] - Message retry attempt limit exceeded. Msg: #{serialize_message(message)}")
 
+          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
 
-            EventQ.log(:info, "[#{self.class}] - Message retry attempts exceeded. Message: #{serialize_message(message)}")
+        #check if the message is allowed to be retried
+        elsif queue.allow_retry
 
-            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
+          EventQ.log(:debug, "[#{self.class}] - Incrementing retry attempts count.")
+          message.retry_attempts += 1
 
+          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(serialize_message(message), :expiration => message_ttl)
+          EventQ.log(:debug, "[#{self.class}] - Published message to retry exchange.")
+
         end
 
         return true
@@ -284,11 +282,12 @@ module EventQ
         error = false
         message = deserialize_message(payload)
 
-        EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
+        EventQ.log(:info, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
 
         message_args = EventQ::MessageArgs.new(message.type, message.retry_attempts)
 
         if(!EventQ::NonceManager.is_allowed?(message.id))
+          EventQ.log(:info, "[#{self.class}] - Duplicate Message received. Dropping message.")
           channel.acknowledge(delivery_info.delivery_tag, false)
           return false
         end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.10.3"
+  VERSION = "1.10.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: eventq_rabbitmq
 version: !ruby/object:Gem::Version
-  version: 1.10.3
+  version: 1.10.4
 platform: ruby
 authors:
 - vaughanbrittonsage
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-24 00:00:00.000000000 Z
+date: 2016-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler