carnivore-sqs 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90900f0e587b869635641f3493b4e2031b7e3ff8
-  data.tar.gz: e4a842b6be117d1ae0f2ab253af9463b0d32285f
+  metadata.gz: d236b2198a13087cecaa8f0839cdee9e90b4feef
+  data.tar.gz: c20b469e06ddfb0e58e2e156413532be05f7419b
 SHA512:
-  metadata.gz: cfe06781991be9396a122455632d93f40c9c1b8e6574e399a276b3f64162470a8a01fbd199c012fb4c29368cb69cdabe4b9d0f36ee3bfc1b3827b9125cb023be
-  data.tar.gz: 1a92cefa9d3018bdf4a54b39307e47751008dd28d61f1ed5948de046b6e5d212d685f7780ef851a5c4c2b1635241642940796f36dd3a6e63800e44b074ab73e0
+  metadata.gz: 0aeec2cefefac492fa19e0cefb904b8b05d63599cf79ec78d3d944985c696d6eb9391468e430a78ce80e4ce340a1343732e003d4449c72a6f7cf8b54e0c1eaf2
+  data.tar.gz: bf869723fbde8600f8e6bb2fd7420276733ef1df174173ca7712c5a2105e10d074f70241b37137ccbcb819509d77bfc7afc97a7ca48b8ae9e611a6277c8fa43a

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.1.14
+* Fix storage of updated queue when format applied on setup
+
 # v0.1.12
 * Feature: Add #touch support
 

data/lib/carnivore-sqs/sqs.rb

@@ -21,14 +21,15 @@ module Carnivore
               @queues.size.times.map(&:to_i).zip(@queues).flatten
           )]
         end
-        @queues.values.map! do |q|
-          format_queue(q)
-        end
+        @queues = Hash[
+          @queues.each do |k,v|
+            [k, format_queue(v)]
+          end
+        ]
         if(args[:processable_queues])
           @processable_queues = Array(args[:processable_queues]).flatten.compact
         end
         @pause_time = args[:pause] || 5
-        @receive_timeout = nil
         debug "Setup for SQS source instance <#{name}> complete"
         debug "Configured queues for handling: #{@queues.inspect}"
       end
@@ -51,16 +52,20 @@ module Carnivore
       end
 
       def receive(n=1)
-        set_receive_timeout!
         count = 0
         msgs = []
         while(msgs.empty?)
           msgs = []
-          @receive_timeout.reset
           msgs = queues.map do |q|
             begin
-              m = @fog.receive_message(q, 'MaxNumberOfMessages' => n).body['Message']
-              m.map{|mg| mg.merge('SourceQueue' => q)}
+              Timeout.timeout(args.fetch(:receive_timeout, 30).to_i) do
+                m = @fog.receive_message(q, 'MaxNumberOfMessages' => n).body['Message']
+                m.map{|mg| mg.merge('SourceQueue' => q)}
+              end
+            rescue Timeout::Error
+              error 'Receive timeout encountered. Triggering a reconnection.'
+              connect
+              retry
             rescue Excon::Errors::Error => e
               error "SQS received an unexpected error. Pausing and running retry (#{e.class}: #{e})"
               debug "SQS ERROR TRACE: #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
@@ -68,7 +73,6 @@ module Carnivore
               retry
             end
           end.flatten.compact
-          @receive_timeout.reset
           if(msgs.empty?)
             if(count == 0)
               debug "Source<#{name}> no message received. Sleeping for #{pause_time} seconds."
@@ -172,10 +176,6 @@ module Carnivore
         m
       end
 
-      def set_receive_timeout!
-        @receive_timeout ||= after(args[:receive_timeout] || 30){ connect }
-      end
-
     end
   end
 end

data/lib/carnivore-sqs/version.rb

@@ -1,5 +1,5 @@
 module Carnivore
   module Sqs
-    VERSION = Gem::Version.new('0.1.12')
+    VERSION = Gem::Version.new('0.1.14')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-sqs
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-14 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
@@ -48,6 +48,7 @@ files:
 - CONTRIBUTING.md
 - LICENSE
 - README.md
+- carnivore-sqs-0.1.12.gem
 - carnivore-sqs.gemspec
 - lib/carnivore-sqs.rb
 - lib/carnivore-sqs/sqs.rb