eventq_rabbitmq 1.9.2 → 1.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a51c8143a1d22375294105728d75bbe0ba23a1ae
-  data.tar.gz: 7cd8c0bc778a48625f5ad82111adcbac68ab7f77
+  metadata.gz: d03949060464cc7738dd78d21b6504174eeda7a9
+  data.tar.gz: 1d8515b4c0df794541b859828cb725666976e1ad
 SHA512:
-  metadata.gz: 78c5a019c0658bb0c62650e4ed577bed7ee490e0977e38dd6561015d33d4bc3ef620b0c8399cfb8d9ddc96472736f98a8e353c56bf966ce582236c5dc9b27266
-  data.tar.gz: ba0cce88cf3da8feed0c768685e9887041faaf9bcb62ef27a8b1d5e4854d2a152f529b93f72300a2cf16d3c081966428c0d4334438a14cfea78c1d472752feee
+  metadata.gz: f64e8f87947fd0b1788753d802f710171dffb262c8acb768b42980c43a6513603a424f12f0a48a733c6c04b83d0406fa89a1eb7c150485c69104eefd16252aab
+  data.tar.gz: 72d86041accdcae9baeb24c4e769dd4170b1d39dcf268a871d1910e801ed95e2659bf514967b25f4487bc05c261a8ee0d70b1f133fede9e813c4168b470d8609

data/lib/eventq_rabbitmq/rabbitmq_queue_worker.rb

@@ -85,13 +85,13 @@ module EventQ
                 break
               end
 
-              has_processed = false
+              has_received_message = false
 
               begin
 
                 channel = @connection.create_channel
 
-                has_processed = thread_process_iteration(channel, manager, queue, block)
+                has_received_message = thread_process_iteration(channel, manager, queue, block)
 
               rescue => e
                 EventQ.logger.error "An unhandled error occurred attempting to communicate with RabbitMQ. Error: #{e} | Backtrace: #{e.backtrace}"
@@ -103,7 +103,8 @@ module EventQ
 
               gc_flush
 
-              if !has_processed
+              if !has_received_message
+                EventQ.log(:debug, "[#{self.class}] - No message received.")
                 EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
                 sleep(@sleep)
               end
@@ -142,19 +143,16 @@ module EventQ
         retry_exchange = manager.get_retry_exchange(channel, queue)
 
         received = false
-        error = false
 
         begin
           delivery_info, properties, payload = q.pop(:manual_ack => true, :block => true)
 
           #check that message was received
           if payload != nil
+            received = true
             begin
               tag_processing_thread
-              process_message(payload, queue, channel, retry_exchange, delivery_info, block) do |received, error|
-                received = received
-                error = error
-              end
+              process_message(payload, queue, channel, retry_exchange, delivery_info, block)
             ensure
               untag_processing_thread
             end
@@ -165,13 +163,7 @@ module EventQ
           EventQ.log(:error, "[#{self.class}] - An error occurred attempting to pop a message from the queue. Error: #{e} | Backtrace: #{e.backtrace}")
         end
 
-        #check if any message was received
-        if !received
-          EventQ.log(:debug, "[#{self.class}] - No message received.")
-          return false
-        end
-
-        return true
+        return received
       end
 
       def stop
@@ -285,7 +277,6 @@ module EventQ
       def process_message(payload, queue, channel, retry_exchange, delivery_info, block)
         abort = false
         error = false
-        received = false
         message = deserialize_message(payload)
 
         EventQ.log(:debug, "[#{self.class}] - Message received. Retry Attempts: #{message.retry_attempts}")
@@ -308,7 +299,6 @@ module EventQ
             #accept the message as processed
             channel.acknowledge(delivery_info.delivery_tag, false)
             EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
-            received = true
           end
 
         rescue => e
@@ -322,8 +312,6 @@ module EventQ
         else
           EventQ::NonceManager.complete(message.id)
         end
-
-        yield [received, error]
       end
     end
   end

data/lib/eventq_rabbitmq/version.rb

@@ -1,3 +1,3 @@
 module EventqRabbitmq
-  VERSION = "1.9.2"
+  VERSION = "1.9.3"
 end

metadata

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