shoryuken 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fd50ddb123d1c14d3ff0a0ac562c3e156afd2dfd
-  data.tar.gz: 9bcd1a88456f1d8454609d7440d209bc78b5a89b
+  metadata.gz: 84439f7b9ae680a0363a63e98c6cbba645541b86
+  data.tar.gz: 72e3f662b660f594d78bb4328b137c43774eaf9d
 SHA512:
-  metadata.gz: 64680cf91fbf51372720f872f0ac7cced4d42e2b86c61b66137fd5993f1e58ca2ab86c907ff49eb8c464817c5c4efe53ea75e234a4ee01a4d558164535086c46
-  data.tar.gz: 75fbaab18cd22e600ccd6e705eef80532faf0236a434803cf0678dc14cf6b7fac30e40d0350e8be2b47eb8dd54289667eeccb12a49af0febbcafc0d5594e05f5
+  metadata.gz: 2c50f7e305327dc7e155c84a8e520579b3d72f0e5d0d224d6b9a0e346a6923c5348e66bd1c63e3a3cbd9ed22adc488680194266d80004556670250c7cc8db450
+  data.tar.gz: c0154a86dd1098ff213c55411fb6fcc50b6a5f2eebb5d207443cce9952355ed5f2ab191f5d321ac91322bb2f1e44b3099404d7b0018aaf300d450f87450d85c2

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [v2.1.3] - 2017-01-27
+- Show a warn message when batch isn't supported
+ - [#302](https://github.com/phstc/shoryuken/pull/302)
+
+- Require Celluloid ~> 17
+ - [#305](https://github.com/phstc/shoryuken/pull/305)
+
+- Fix excessive logging when 0 messages found
+ - [#307](https://github.com/phstc/shoryuken/pull/307)
+
 ## [v2.1.2] - 2016-12-22
 - Fix loading `logfile` from shoryuken.yml
  - [#296](https://github.com/phstc/shoryuken/pull/296)

data/lib/shoryuken/fetcher.rb

@@ -14,7 +14,7 @@ module Shoryuken
           limit = available_processors > FETCH_LIMIT ? FETCH_LIMIT : available_processors
 
           sqs_msgs = Array(receive_messages(queue, limit))
-          logger.info { "Found #{sqs_msgs.size} messages for '#{queue.name}'" }
+          logger.info { "Found #{sqs_msgs.size} messages for '#{queue.name}'" } if !sqs_msgs.empty?
           logger.debug { "Fetcher for '#{queue}' completed in #{elapsed(started_at)} ms" }
           sqs_msgs
         rescue => ex

data/lib/shoryuken/middleware/server/auto_extend_visibility.rb

@@ -4,10 +4,18 @@ module Shoryuken
   module Middleware
     module Server
       class AutoExtendVisibility
+        include Util
+
         EXTEND_UPFRONT_SECONDS = 5
 
         def call(worker, queue, sqs_msg, body)
+          if sqs_msg.is_a?(Array)
+            logger.warn { "Auto extend visibility isn't supported for batch workers"  }
+            return yield
+          end
+
           timer = auto_visibility_timer(worker, queue, sqs_msg, body)
+
           begin
             yield
           ensure

data/lib/shoryuken/middleware/server/exponential_backoff_retry.rb

@@ -5,6 +5,11 @@ module Shoryuken
         include Util
 
         def call(worker, queue, sqs_msg, body)
+          if sqs_msg.is_a?(Array)
+            logger.warn { "Exponential backoff isn't supported for batch workers"  }
+            return yield
+          end
+
           started_at = Time.now
           yield
         rescue

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '2.1.2'
+  VERSION = '2.1.3'
 end

data/shoryuken.gemspec

@@ -21,9 +21,8 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'rspec'
   spec.add_development_dependency 'pry-byebug'
-  spec.add_development_dependency 'nokogiri'
   spec.add_development_dependency 'dotenv'
 
   spec.add_dependency 'aws-sdk-core', '~> 2'
-  spec.add_dependency 'celluloid', '~> 0.16'
+  spec.add_dependency 'celluloid', '~> 0.17'
 end

data/spec/shoryuken/middleware/server/auto_extend_visibility_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Shoryuken::Middleware::Server::AutoExtendVisibility do
+RSpec.describe Shoryuken::Middleware::Server::AutoExtendVisibility do
   let(:queue) { 'default' }
   let(:visibility_timeout) { 3 }
   let(:extend_upfront) { 1 }
@@ -34,6 +34,12 @@ describe Shoryuken::Middleware::Server::AutoExtendVisibility do
     stub_const('Shoryuken::Middleware::Server::AutoExtendVisibility::EXTEND_UPFRONT_SECONDS', extend_upfront)
   end
 
+  context 'when batch worker' do
+    it 'yields' do
+      expect { |b| subject.call(nil, nil, [], nil, &b) }.to yield_control
+    end
+  end
+
   it 'extends message visibility if jobs takes a long time' do
     TestWorker.get_shoryuken_options['auto_visibility_timeout'] = true
 

data/spec/shoryuken/middleware/server/exponential_backoff_retry_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
+RSpec.describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
   let(:queue)     { 'default' }
   let(:sqs_queue) { double Shoryuken::Queue }
   let(:sqs_msg)   { double Shoryuken::Message, queue_url: queue, body: 'test', receipt_handle: SecureRandom.uuid,
@@ -10,6 +10,12 @@ describe Shoryuken::Middleware::Server::ExponentialBackoffRetry do
     allow(Shoryuken::Client).to receive(:queues).with(queue).and_return(sqs_queue)
   end
 
+  context 'when batch worker' do
+    it 'yields' do
+      expect { |b| subject.call(nil, nil, [], nil, &b) }.to yield_control
+    end
+  end
+
   context 'when a job succeeds' do
     it 'does not retry the job' do
       TestWorker.get_shoryuken_options['retry_intervals'] = [300, 1800]

data/spec/spec_helper.rb

@@ -5,7 +5,6 @@ require 'pry-byebug'
 require 'celluloid/current'
 require 'shoryuken'
 require 'json'
-require 'multi_xml'
 require 'dotenv'
 Dotenv.load
 
@@ -21,15 +20,6 @@ Shoryuken::EnvironmentLoader.setup_options(config_file: config_file)
 Shoryuken.logger.level = Logger::UNKNOWN
 Celluloid.logger.level = Logger::UNKNOWN
 
-# I'm not sure whether this is an issue specific to running Shoryuken against github.com/comcast/cmb
-# as opposed to AWS itself, but sometimes the receive_messages call returns XML that looks like this:
-#
-# <ReceiveMessageResponse>\n\t<ReceiveMessageResult>\n\t</ReceiveMessageResult> ... </ReceiveMessageResponse>
-#
-# The default MultiXML parser is ReXML, which seems to mishandle \n\t chars. Nokogiri seems to be
-# the only one that correctly ignore this whitespace.
-MultiXml.parser = :nokogiri
-
 class TestWorker
   include Shoryuken::Worker
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
 platform: ruby
 authors:
 - Pablo Cantero
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-23 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -67,20 +67,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -115,14 +101,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.16'
+        version: '0.17'
 description: Shoryuken is a super efficient AWS SQS thread based message processor
 email:
 - pablo@pablocantero.com