eventq_aws 1.5.1 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a2d351facd07b1bb4cf1008a99ed0c97437e6998
-  data.tar.gz: f92c24c19f8e8d8c51d9824b703cc64a791cd69d
+  metadata.gz: a3a4f844b9f491cfebb6546c0a1dcfbafc907339
+  data.tar.gz: 9319dca6a682b2e18652522c33e1371248fb12b8
 SHA512:
-  metadata.gz: 2ef160d8087df0b6ea1fc148b62cf144ba167c4d55071ded4abfb226c08cb06017e2f2a03a9ff4b7d1cd271810ce93133d78eb4b932bb3cc826f11a5dc091b0b
-  data.tar.gz: 07c0c07c428dbeed274f157fed4e6fc04d17dcfb487a28e6cd32623d1e0f791aea6fe7632cdda971b532a9544abecc2c2fd226c0af5c7bdfd5271fa67e962aac
+  metadata.gz: a65b40297c1e4c0413aa8c9644ee23b708d7f32bee9b5fdf3e8f88aa7c722f4d6e2ebef41d088ca5ccc8d81251461604f21a8a55611ff16c941541da2febd1b2
+  data.tar.gz: 57db8ddc7162af56300c6b1d1333e14cb5d773b2e95a3b52c2583c6b976e7704b703d7d836f7dbd7b5ea08bb06bc5ace5e504c9d8c30711cc9905810567a8223

data/lib/eventq_aws/aws_queue_worker.rb

@@ -86,13 +86,16 @@ module EventQ
                 break
               end
 
-              has_processed = thread_process_iteration(client, manager, queue, block)
+              has_message_received = thread_process_iteration(client, manager, queue, block)
 
               gc_flush
 
-              if !has_processed && @sleep > 0
-                EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
-                sleep(@sleep)
+              if !has_message_received
+                EventQ.log(:debug, "[#{self.class}] - No message received.")
+                if @sleep > 0
+                  EventQ.log(:debug, "[#{self.class}] - Sleeping for #{@sleep} seconds")
+                  sleep(@sleep)
+                end
               end
 
             end
@@ -124,7 +127,6 @@ module EventQ
         q = manager.get_queue(queue)
 
         received = false
-        error = false
 
         begin
 
@@ -138,12 +140,10 @@ module EventQ
 
           #check that a message was received
           if response.messages.length > 0
+            received = true
             begin
               tag_processing_thread
-              process_message(response, client, queue, q, block) do |received, error|
-                received = received
-                error = error
-              end
+              process_message(response, client, queue, q, block)
             ensure
               untag_processing_thread
             end
@@ -154,13 +154,7 @@ module EventQ
           EventQ.log(:error, "[#{self.class}] - An error occurred attempting to retrieve a message from the queue. Error: #{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
@@ -186,7 +180,6 @@ module EventQ
       private
 
       def process_message(response, client, queue, q, block)
-        abort = false
         msg = response.messages[0]
         retry_attempts = msg.attributes[APPROXIMATE_RECEIVE_COUNT].to_i - 1
 
@@ -209,13 +202,11 @@ module EventQ
           block.call(message.content, message_args)
 
           if message_args.abort == true
-            abort = true
             EventQ.log(:info, "[#{self.class}] - Message aborted.")
           else
             #accept the message as processed
             client.sqs.delete_message({ queue_url: q, receipt_handle: msg.receipt_handle })
             EventQ.log(:info, "[#{self.class}] - Message acknowledged.")
-            received = true
           end
 
         rescue => e
@@ -225,7 +216,7 @@ module EventQ
 
         end
 
-        if abort || error
+        if message_args.abort || error
           EventQ::NonceManager.failed(message.id)
           EventQ.log(:info, "[#{self.class}] - Message rejected.")
           reject_message(queue, client, msg, q, retry_attempts)
@@ -233,8 +224,6 @@ module EventQ
           EventQ::NonceManager.complete(message.id)
         end
 
-        yield [received, error]
-
         return true
       end
 

data/lib/eventq_aws/version.rb

@@ -1,5 +1,5 @@
 module EventQ
   module Amazon
-    VERSION = "1.5.1"
+    VERSION = "1.5.2"
   end
 end

metadata

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