carnivore-sqs 0.1.2 → 0.1.4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ed558475ba23fbf8a12d0c309972ee6576f4b417
+  data.tar.gz: e2033a5a84af8a75d40dadae088f689b2316009a
+SHA512:
+  metadata.gz: 6f3c7036b47c9dea5393256900618f4a4a9aa5f8caaa43b21383680a6cf79845808d5dec692cecbaad08aac6f74fafc1e422cd906cebc9c41c933b9892974195
+  data.tar.gz: fdc46dbadd7f0cf9d2742dbfb8b674432c8ca41dae32526564e16463a5a14f9062dc43a007fbe1592e1a974f339ea1cf9a0ebf55e95616f6ac8c89d17f5caf09

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# v0.1.4
+* Make remote queue connection more resistant to failures
+* Add better logging for connection setup and establishment
+* Timeout should only be enabled when processing enabled
+
 # v0.1.2
 * Fix up queue formatting to prevent error on actor restarts
 * Always dump transmit object if not string type

data/CONTRIBUTING.md

@@ -0,0 +1,25 @@
+# Contributing
+
+## Branches
+
+### `master` branch
+
+The master branch is the current stable released version.
+
+### `develop` branch
+
+The develop branch is the current edge of development.
+
+## Pull requests
+
+* https://github.com/carnivore-rb/carnivore-sqs/pulls
+
+Please base all pull requests of the `develop` branch. Merges to
+`master` only occur through the `develop` branch. Pull requests
+based on `master` will likely be cherry picked.
+
+## Issues
+
+Need to report an issue? Use the github issues:
+
+* https://github.com/carnivore-rb/carnivore-sqs/issues

data/LICENSE

@@ -0,0 +1,13 @@
+   Copyright 2014 Chris Roberts
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/carnivore-sqs.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.email = 'chrisroberts.code@gmail.com'
   s.homepage = 'https://github.com/carnivore-rb/carnivore-sqs'
   s.description = 'Carnivore SQS source'
+  s.license = 'Apache 2.0'
   s.require_path = 'lib'
   s.add_dependency 'carnivore', '>= 0.1.8'
   s.add_dependency 'fog'

data/lib/carnivore-sqs/sqs.rb

@@ -28,9 +28,9 @@ module Carnivore
           @processable_queues = Array(args[:processable_queues]).flatten.compact
         end
         @pause_time = args[:pause] || 5
-        @receive_timeout = after(args[:receive_timeout] || 30){ terminate }
-        debug "Creating SQS source instance <#{name}>"
-        debug "Handled queues: #{@queues.inspect}"
+        @receive_timeout = nil
+        debug "Setup for SQS source instance <#{name}> complete"
+        debug "Configured queues for handling: #{@queues.inspect}"
       end
 
       def format_queue(q)
@@ -47,16 +47,25 @@ module Carnivore
 
       def connect
         @fog = Fog::AWS::SQS.new(@connection_args)
+        debug "Connection for SQS source instance <#{name}> is now complete"
       end
 
       def receive(n=1)
+        set_receive_timeout!
         count = 0
         msgs = []
         while(msgs.empty?)
           msgs = []
           @receive_timeout.reset
           msgs = queues.map do |q|
-            m = @fog.receive_message(q, 'MaxNumberOfMessages' => n).body['Message']
+            begin
+              m = @fog.receive_message(q, 'MaxNumberOfMessages' => n).body['Message']
+            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")}"
+              sleep Carnivore::Config.get(:carnivore, :sqs, :retry_wait) || 5
+              retry
+            end
             m.map! do |msg|
               msg.merge('SourceQueue' => q)
             end
@@ -78,9 +87,16 @@ module Carnivore
       end
 
       def transmit(message, original=nil)
-        queue = determine_queue(original)
-        message = JSON.dump(message) unless message.is_a?(String)
-        @fog.send_message(queue, message)
+        begin
+          queue = determine_queue(original)
+          message = JSON.dump(message) unless message.is_a?(String)
+          @fog.send_message(queue, message)
+        rescue Excon::Errors::Error => e
+          error "SQS transmission received an unexpected error. Pausing and running retry (#{e.class}: #{e})"
+          debug "SQS ERROR TRACE: #{e.class}: #{e}\n#{e.backtrace.join("\n")}"
+          sleep Carnivore::Config.get(:carnivore, :sqs, :retry_wait) || 5
+          retry
+        end
       end
 
       def confirm(message)
@@ -143,6 +159,10 @@ 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,7 +1,5 @@
 module Carnivore
   module Sqs
-    class Version < Gem::Version
-    end
-    VERSION = Version.new('0.1.2')
+    VERSION = Gem::Version.new('0.1.4')
   end
 end

metadata

@@ -1,46 +1,41 @@
 --- !ruby/object:Gem::Specification
 name: carnivore-sqs
 version: !ruby/object:Gem::Version
-  version: 0.1.2
-  prerelease: 
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2014-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carnivore
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.8
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Carnivore SQS source
@@ -49,35 +44,37 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/carnivore-sqs/version.rb
-- lib/carnivore-sqs/sqs.rb
-- lib/carnivore-sqs.rb
-- carnivore-sqs.gemspec
-- README.md
 - CHANGELOG.md
+- CONTRIBUTING.md
+- LICENSE
+- README.md
+- carnivore-sqs.gemspec
+- lib/carnivore-sqs.rb
+- lib/carnivore-sqs/sqs.rb
+- lib/carnivore-sqs/version.rb
 homepage: https://github.com/carnivore-rb/carnivore-sqs
-licenses: []
+licenses:
+- Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Message processing helper
 test_files: []
 has_rdoc: