sqewer 5.0.7 → 5.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9dcb51913e099f74dcebca87941f16715b8d3da7
-  data.tar.gz: e342a210559bf3fb1991b354b764f76adcf64549
+  metadata.gz: 303e0674eeb56dc7ff4a8056482a828988eb53c5
+  data.tar.gz: 47762bf5591cac2d28a6a6b7078a97c82a697b45
 SHA512:
-  metadata.gz: 2be69cb69a9310a1cbfc39f55a709cff854c2638e183d849e6ee9006bcdc922a776af07df97eb333a8beaaf21fc4489479aa0cb4c41136b38d8217e9c6a14159
-  data.tar.gz: 148aa651f6b73d6ec04c7edd012776c8861d4a187c19529f5fea28c338d056ddcb08411802d5593948496b26419d31b1523295045a6ce9be750c5a4ec25b8253
+  metadata.gz: fa6a9832e1833e9ed3ec3b2a316001b4637bc9eeec997474a265aa9242c5b3e490752fa8c12f4d238a5bd6c2ef8a8012ca2e37651d853d4f53b879fc7e253a9e
+  data.tar.gz: 10327bbbe1e13113f7ed4910c6feb90f29b1148ee0af9f98762eab127287bfa3038be7609709cd76079efea10038b5d06c25ae9c851c796bfc479947dea33892

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
-- 2.1.5
 - 2.2.2
+- 2.3.3
+- 2.4.1
 sudo: false
 cache: bundler
 env:
@@ -8,4 +9,4 @@ env:
   - secure: E+uNoJmvjq5+3/PYUs2a1bRh7bCjAbcYEIKJzOVgIiI+gWB4dLpTKwVW/fqJbjCDIGPw9OwiwphN51zLEo0ie5AJIkavcjWRcdazKq8usokAz/A5Ilru5YvGXJ5UQtF8TJNsZfJGOGMJwL5d/MsDSd3/sjy88wrFiSeeNlHA06KDBrGdZXE4/dOb5Z84cSxPaD7nDaGP36V3Uv88X272oezODm9Mp+Fsf4goGoU9I9PBDD36pCXAlpURWpyWMKa2TzEXfgN43TYxta4p+bu6BA871df31j3BfVKwY1K/59eN9HqW8xWF9rgcgLo3NgQuaoqde3ryCE4jqKymjtG1/R5bdbQsn07R7/OagQMPVkbn07Aq+X6Q8GVTkrMl829z87QiMETNnzpsHl/1RD3DVnUo4k+XmqLbwW6NRl452j3eEHsiMvxf1vt8Qn1hu61qm98WGVNCGFWX/eAu/iTpvDcQOkoUuUEfGnXPaGeM8GT7tNdKptT8gsg/H0Dwb4d0qwA8uAEWttmZBmI9145hpnIk+hkDkH22dzhTus8d7CfFDSpu7s3y9434wiCYF5pkugyWJb5dd24d00ssgF5gqhLU/s48WcBwipl8mMGu/H/5ezh/pG9dL2uDIUjKRrUybE/vmDJGy8ZEDnOwJ04NJ701vQjFybgZRXXyU5ESEJQ=
   - secure: hq1T5MsHGmEnfQjOJlu/GzUPJ4WH0+lZOHezb4i0rFmRtWnmOMO+YUA34q9P6VQROk5KcAiRKtqZYmxZwTjyJVk2DTcJkvUAVzWBHD+MZAsH/lql+lnUJTuZRapYI85LChmEZkDMhYxZYfxTqGTbE4GjLtVtGN8zmTRStLxtvqyfiaU0SuGzyw9wfso/QhqHadQAQ7NttTYyiSiO2vHxK7rhmNi99MxAeVL3qZ3H2mcypSEE7CZd+nFa2CQxh/Guce0i+N2PDYTB6dsvA4xA5Xh/e+han3g4x/sRpic2C/9HS2zRYf0iN20+pFyotp5SaW3o5Q5S3iUqQtyZoR2lN1YMd4csyyKp/0G4QOjAPIN3FIef/RTVLqdfZXaord4iAg9GN9eKdtgYuS7JgyDl0VOmTpS2RYuDP+PGR2HRXXVc0gHt2aFl/oy+DTXh6emcOkpZtRZlbHqtVz5WXZZftm8niId+UXQmJuIQU+YgIiFDmviafapwjaYoXHCv8QMAGqNBP5EWDfxvYyPtGhQrj37sRYpfnUCkdJCiZvZLhQgQ0aIvR3KJIFpXtQmWaaT3e7u07B6weBB7Icto6WflfKtYHvVd1YfOX02/J8byhJbzRY+Qjqrq+5aQR1L3AKbmv8AooZdcm/CrEx6MP7xuIM0fjp1oU4cKQe74KX/KuqE=
   - secure: fWzpY63ZAXOtjEJuYoya/mwzJ7fZQJGsN6hhamXorOhUgaeP2vdC7/6gK3PPMIXOJ5NXPiANGbAUWKgLLWJ3F7rK2y9UCUWTzvE2CK/13vUV9de7byQfAjfHo7wjDJuPLved+WmSM7ASVjzGq9wQS8MTeYUymSNVY3xiZcvNTO2XY9AAu32SSWDs1ayXiCGE9DyN5WEvEEPixHqpplZLvSqTtKtEZVdP/a3tPuzogYFvoJ/ZEfG9LRr4nnbwuKCaTljpYaZc/8yFbhhJgCrTuOKb0gB/UFeMjd0WX6MQWofzIj152d0ghCTlgtESR2LQJdSXA2BO0ZzSqYj8NKTAcZ8IsaUj+6kBgfQGHu43TF/dB877v8pY55HS8a3gFPDK/6OZhRT7UcFZgle1qvX422CD196fRHktSBcDTx9jQsG8r7Ray9oJygXQr6tKhrRkjMkkBAiBd/GkIJkJu5RecmlLOZMJ+YeYa95kWDUXwo3HGK9MxtFyuplSRYk4mQ1jbrJXdmufQuTazl2FYL+elOUeUb8ej3iniUcmyDGU6tZx84aZTbBOaovmeQqr3pXIaXYMhvkRGLD3Ky7SNZN9ZzFczRWcKStyQal+BYK1R3RU8cD0m0PEpUxV5ERP50E3GyN/0d0bg22LywK9aWDHOhCzjI0emVvSAn8ZiY78SSo=
-  - AWS_REGION=eu-central-1
+  - AWS_REGION=eu-central-1

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 2017-06-12
+- Released v5.0.8 to Rubygems.org.
+- Retry sending and deleting messages when `sender_fault=false`.
+
 ### 2017-05-26
 - Released v5.0.7 to Rubygems.org.
 - Report errors with string interpolation to avoid confusion.

data/lib/sqewer.rb

@@ -25,4 +25,7 @@ module Sqewer
   
   # If we are within Rails, load the railtie
   require_relative 'sqewer/extensions/railtie' if defined?(Rails)
+
+  # Explicitly require retriable so that it ia available for use.
+  require 'retriable'
 end

data/lib/sqewer/connection.rb

@@ -8,6 +8,9 @@
 class Sqewer::Connection
   DEFAULT_TIMEOUT_SECONDS = 5
   BATCH_RECEIVE_SIZE = 10
+  MAX_RANDOM_FAILURES_PER_CALL = 10
+
+  NotOurFaultAwsError = Class.new(StandardError)
 
   # A wrapper for most important properties of the received message
   class Message < Struct.new(:receipt_handle, :body)
@@ -96,14 +99,8 @@ class Sqewer::Connection
   def send_multiple_messages
     buffer = SendBuffer.new
     yield(buffer)
-    buffer.each_batch do | batch |
-      resp = client.send_message_batch(queue_url: @queue_url, entries: batch)
-      failed = resp.failed
-      if failed.any?
-        err = failed.inspect + ', ' + resp.inspect
-        raise "#{failed.length} messages failed to send: #{err}"
-      end
-    end
+
+    buffer.each_batch {|batch| handle_batch_with_retries(:send_message_batch, batch) }
   end
 
   # Deletes a message after it has been succesfully decoded and processed
@@ -122,18 +119,26 @@ class Sqewer::Connection
     buffer = DeleteBuffer.new
     yield(buffer)
 
-    buffer.each_batch do | batch |
-      resp = client.delete_message_batch(queue_url: @queue_url, entries: batch)
-      failed = resp.failed
-      if failed.any?
-        err = failed.inspect + ', ' + resp.inspect
-        raise "#{failed.length} messages failed to delete: #{err}"
-      end
-    end
+    buffer.each_batch {|batch| handle_batch_with_retries(:delete_message_batch, batch) }
   end
 
   private
 
+  def handle_batch_with_retries(method, batch)
+    Retriable.retriable on: NotOurFaultAwsError, tries: MAX_RANDOM_FAILURES_PER_CALL do
+      resp = client.send(method, queue_url: @queue_url, entries: batch)
+      wrong_messages, aws_failures = resp.failed.partition {|m| m.sender_fault }
+      if wrong_messages.any?
+        err = wrong_messages.inspect + ', ' + resp.inspect
+        raise "#{wrong_messages.length} messages failed while doing #{method.to_s} with error: #{err}"
+      elsif aws_failures.any?
+        # We set the 'batch' param to an array with only the failed messages so only those get retried
+        batch = aws_failures.map {|aws_response_message| batch.find { |m| aws_response_message.id.to_s == m[:id] }}
+        raise NotOurFaultAwsError
+      end
+    end
+  end
+
   class RetryWrapper < Struct.new(:sqs_client)
     MAX_RETRIES = 1000
     # Provide retrying wrappers for all the methods of Aws::SQS::Client that we actually use

data/lib/sqewer/version.rb

@@ -1,3 +1,3 @@
 module Sqewer
-  VERSION = '5.0.7'
+  VERSION = '5.0.8'
 end

data/sqewer.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'aws-sdk', '~> 2'
   spec.add_runtime_dependency 'very_tiny_state_machine'
   spec.add_runtime_dependency 'ks'
+  spec.add_runtime_dependency 'retriable'
   
   spec.add_development_dependency "bundler", "~> 1"
   spec.add_development_dependency "rake", "~> 10.0"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sqewer
 version: !ruby/object:Gem::Version
-  version: 5.0.7
+  version: 5.0.8
 platform: ruby
 authors:
 - Julik Tarkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: retriable
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -240,7 +254,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Process jobs from SQS