envoi-mam-agent 1.3.3 → 1.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6c018c235b16bdb909cc62ef96f71a50d41471ca
-  data.tar.gz: 9762194aa13fd04a301699ef3572cdab5efc719d
+  metadata.gz: 9e39a1126b74c5cef31e17223c4eda416441fee4
+  data.tar.gz: 95761df9c0ae153134ce68d4ed75be5e649baf12
 SHA512:
-  metadata.gz: 7000b7b8b389f9cac2d6cc50c7949b87ca79dae5cb394fa96e50dccade9015d8bb4ac3689dab6bbec3283e62166567759b110c8779a6ed344ea76edbdcd92960
-  data.tar.gz: 0016e9047d4424a9d3be07ea59118751e8ee4f9a24e21821dc54e6ae0ba32b8c97b5729323e5d44d2c36b99fe4debcc89ce027a16ec8d6435f3e447c04fc624a
+  metadata.gz: 81b822772c0f696e98765bdf4fd8242a9000f9ab17990a260d55fc4f01b9f46e48c7d7df163e7caa57d4485dd5257d72eddb36a3eefe8847c6675b8b9368bb27
+  data.tar.gz: be1e49c65bf70c27d1c62f0cc833a90d006b8379bafe1f0795f885d6cf2adae4ad8a999c496fd9d6a58e619e7ec65f0fac797c97bb743b49dd68cc8e85033d94

data/lib/envoi/mam/agent/version.rb

@@ -1,7 +1,7 @@
 module Envoi
   module Mam
     class Agent
-      VERSION = '1.3.3'.freeze
+      VERSION = '1.3.4'.freeze
     end
   end
 end

data/lib/envoi/restore/agent.rb

@@ -26,8 +26,9 @@ module Envoi
         msg_body_parsed = JSON.parse(message.body)
         event = msg_body_parsed
 
-        worker_thread = Thread.new(event, @event_handler) do
-          @event_handler.process_event(event)
+        result = nil
+        worker_thread = Thread.new(event, @event_handler, result) do
+          result = @event_handler.process_event(event)
         end
 
         visibility_timeout = 5
@@ -37,17 +38,18 @@ module Envoi
           change_message_visibility_timeout(new_visibility_timeout)
           sleep visibility_timeout
         end
-
-        delete_message
+        if result && result[:success]
+          delete_message
+        end
       end
 
       def change_message_visibility_timeout(visibility_timeout)
-        logger.debug { "Updating Visibility Timeout for Message #{message.receipt_handle}..."}
+        logger.debug { "Updating Visibility Timeout for Message #{message.message_id}..."}
         queue_handler.poller.change_message_visibility_timeout(message, visibility_timeout)
       end
 
       def delete_message
-        logger.debug { "Deleting Message #{message.receipt_handle}..."}
+        logger.debug { "Deleting Message #{message.message_id}..."}
         queue_handler.poller.delete_message(message)
       end
 
@@ -103,8 +105,8 @@ module Envoi
           messages.each do |msg|
             break if @should_stop
             break if @thread_limit && @threads.length >= @thread_limit
-            logger.info { "Processing Message... "}
-            logger.info { "Message: #{msg}" }
+            logger.info { "Processing Message #{msg.message_id}... "}
+            logger.debug { "Message: #{msg}" }
 
             message_handler = SQSMessageHandler.new(logger: logger,
                                                     queue_handler: @queue_handler.dup,
@@ -113,10 +115,11 @@ module Envoi
             t = Thread.new(message_handler) { |mh| mh.process }
             @threads << t
           end
-          @threads.keep_if { |t| t.alive? }
+          @threads.keep_if(&:alive?)
           throw :stop_polling if @should_stop
           throw :skip_delete
         end
+
         @running = false
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: envoi-mam-agent
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.3.4
 platform: ruby
 authors:
 - John Whitson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asperalm