shoryuken 3.1.4 → 3.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ff2018a0359b4e5287c85d99d56cbe38c8c0b01
-  data.tar.gz: 363cc8117930365492c2049aaafc7b4b670f1e95
+  metadata.gz: ed935b3a706f2e96acd020a62bee5141910bf63f
+  data.tar.gz: 502827e59b4c18b605eccbd7c9b31829afaef23e
 SHA512:
-  metadata.gz: 6cde1b21dab95a1ee1b7eea7e313ccba94728745ca708d59bf64ee0a1ca7f32b07302ca02963732d326eb8291ea386c4f1651d8499511a7d2df93bca10a9073a
-  data.tar.gz: '0338ea06538ec87a07f6ab88f978670a43610f6ea79d0a1fbb24eea0a262c436aeb25e9be8f042faf7e78793a7fc53a80640e6e8970b1bd77bf6b70bf5469457'
+  metadata.gz: 802af1fc13ac74c36745582d3b796def81bfdd53d8340a44ea212813a8cb3598d40969821c8172eeba6dca2a10a8be8affce9d7390dee028660a46f909533601
+  data.tar.gz: '075822afd74835bbe91e49efa991dc24957405ce830005f2f4c59d0add5e5db39633680a5bda5647af7ec7e74815ca0050ea6a316bf5e5bed870d7e048224db1'

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v3.1.5] - 2017-07-23
+
+- Fix memory leak
+ - [#414](https://github.com/phstc/shoryuken/pull/414)
+
+- Fail fast on bad queue URLs
+ - [#413](https://github.com/phstc/shoryuken/pull/413)
+
 ## [v3.1.4] - 2017-07-14
 
 - Require forwardable allowding to call `shoryuken` without `bundle exec`

data/lib/shoryuken/launcher.rb

@@ -3,8 +3,7 @@ module Shoryuken
     include Util
 
     def initialize
-      @managers    = create_managers
-      @shutdowning = Concurrent::AtomicBoolean.new(false)
+      @managers = create_managers
     end
 
     def start
@@ -41,24 +40,10 @@ module Shoryuken
 
     def start_managers
       @managers.each do |manager|
-        Concurrent::Promise.execute { manager.start }.rescue do |ex|
-          log_manager_failure(ex)
-          start_soft_shutdown
-        end
+        Concurrent::Future.execute { manager.start }
       end
     end
 
-    def start_soft_shutdown
-      Process.kill('USR1', Process.pid) if @shutdowning.make_true
-    end
-
-    def log_manager_failure(ex)
-      return unless ex
-
-      logger.error { "Manager failed: #{ex.message}" }
-      logger.error { ex.backtrace.join("\n") } unless ex.backtrace.nil?
-    end
-
     def initiate_stop
       logger.info { 'Shutting down' }
 

data/lib/shoryuken/manager.rb

@@ -27,9 +27,7 @@ module Shoryuken
     def dispatch_loop
       return unless running?
 
-      Concurrent::Promise.execute(
-        executor: @executor
-      ) { dispatch }.then { dispatch_loop }.rescue { |ex| raise ex }
+      @executor.post { dispatch }
     end
 
     def dispatch
@@ -44,6 +42,10 @@ module Shoryuken
       logger.debug { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{@polling_strategy.active_queues}" }
 
       batched_queue?(queue) ? dispatch_batch(queue) : dispatch_single_messages(queue)
+
+      dispatch_loop
+    rescue => ex
+      handle_dispatch_error(ex)
     end
 
     def busy
@@ -96,5 +98,12 @@ module Shoryuken
 
       sqs_msgs
     end
+
+    def handle_dispatch_error(ex)
+      logger.error { "Manager failed: #{ex.message}" }
+      logger.error { ex.backtrace.join("\n") } unless ex.backtrace.nil?
+
+      Process.kill('USR1', Process.pid)
+    end
   end
 end

data/lib/shoryuken/queue.rb

@@ -49,20 +49,27 @@ module Shoryuken
 
     private
 
-    def set_name(name)
+    def set_by_name(name)
       self.name = name
       self.url  = client.get_queue_url(queue_name: name).queue_url
-    rescue Aws::Errors::NoSuchEndpointError, Aws::SQS::Errors::NonExistentQueue => ex
-      raise ex, "The specified queue #{name} does not exist."
     end
 
-    def set_url(url)
+    def set_by_url(url)
       self.name = url.split('/').last
       self.url  = url
     end
 
     def set_name_and_url(name_or_url)
-      name_or_url.start_with?('https://sqs.') ? set_url(name_or_url) : set_name(name_or_url)
+      if name_or_url.start_with?('https://sqs.')
+        set_by_url(name_or_url)
+
+        # anticipate the fifo? checker for validating the queue URL
+        return fifo?
+      end
+
+      set_by_name(name_or_url)
+    rescue Aws::Errors::NoSuchEndpointError, Aws::SQS::Errors::NonExistentQueue => ex
+      raise ex, "The specified queue #{name_or_url} does not exist."
     end
 
     def queue_attributes

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.1.4'.freeze
+  VERSION = '3.1.5'.freeze
 end

data/spec/shoryuken/queue_spec.rb

@@ -1,5 +1,6 @@
 require 'spec_helper'
 
+# rubocop:disable Metrics/BlockLength
 RSpec.describe Shoryuken::Queue do
   let(:credentials) { Aws::Credentials.new('access_key_id', 'secret_access_key') }
   let(:sqs) { Aws::SQS::Client.new(stub_responses: true, credentials: credentials) }
@@ -15,10 +16,12 @@ RSpec.describe Shoryuken::Queue do
   end
 
   describe '#new' do
-    context 'when queue url supplied' do
-      subject { described_class.new(sqs, queue_url) }
+    context 'when queue URL supplied' do
+      it 'instantiates by URL and validate the URL' do
+        expect_any_instance_of(described_class).to receive(:fifo?).and_return(false)
+
+        subject = described_class.new(sqs, queue_url)
 
-      specify do
         expect(subject.name).to eq(queue_name)
       end
     end
@@ -51,7 +54,9 @@ RSpec.describe Shoryuken::Queue do
         failure = double(id: 'id', code: 'code', message: '...', sender_fault: false)
         logger = double 'Logger'
 
-        expect(sqs).to receive(:delete_message_batch).with(entries: entries, queue_url: queue_url).and_return(double(failed: [failure]))
+        expect(sqs).to(
+          receive(:delete_message_batch).with(entries: entries, queue_url: queue_url).and_return(double(failed: [failure]))
+        )
         expect(subject).to receive(:logger).and_return(logger)
         expect(logger).to receive(:error)
 
@@ -111,36 +116,30 @@ RSpec.describe Shoryuken::Queue do
   end
 
   describe '#send_messages' do
-    before {
-      allow(subject).to receive(:fifo?).and_return(false)
-    }
+    before { allow(subject).to receive(:fifo?).and_return(false) }
+
     it 'accepts SQS request parameters' do
       # https://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Client.html#send_message_batch-instance_method
-      expect(sqs).to receive(:send_message_batch).with(hash_including(entries: [{id: '0', message_body: 'msg1'}, {id: '1', message_body: 'msg2'}]))
+      expect(sqs).to(
+        receive(:send_message_batch).with(hash_including(entries: [{id: '0', message_body: 'msg1'}, {id: '1', message_body: 'msg2'}]))
+      )
 
       subject.send_messages(entries: [{id: '0', message_body: 'msg1'}, {id: '1', message_body: 'msg2'}])
     end
 
     it 'accepts an array of messages' do
-      options = { entries: [{ id: '0',
-        message_body: 'msg1',
-        delay_seconds: 1,
-        message_attributes: { attr: 'attr1' } },
-        { id: '1',
-          message_body: 'msg2',
-          delay_seconds: 1,
-          message_attributes: { attr: 'attr2' } }] }
-
+      options = { entries: [
+        { id: '0', message_body: 'msg1', delay_seconds: 1, message_attributes: { attr: 'attr1' } },
+        { id: '1', message_body: 'msg2', delay_seconds: 1, message_attributes: { attr: 'attr2' } }
+      ] }
       expect(sqs).to receive(:send_message_batch).with(hash_including(options))
 
-      subject.send_messages([{ message_body:       'msg1',
-        delay_seconds:      1,
-        message_attributes: { attr: 'attr1' }
-      }, {
-        message_body:       'msg2',
-        delay_seconds:      1,
-        message_attributes: { attr: 'attr2' }
-      }])
+      subject.send_messages(
+        [
+          { message_body: 'msg1', delay_seconds: 1, message_attributes: { attr: 'attr1' } },
+          { message_body: 'msg2', delay_seconds: 1, message_attributes: { attr: 'attr2' } }
+        ]
+      )
     end
 
     context 'when FIFO' do
@@ -170,16 +169,24 @@ RSpec.describe Shoryuken::Queue do
             expect(first_entry[:message_deduplication_id]).to eq 'my id'
           end
 
-          subject.send_messages([{ message_body: 'msg1',
-            message_attributes: { attr: 'attr1' },
-            message_group_id: 'my group',
-            message_deduplication_id: 'my id' }])
+          subject.send_messages(
+            [
+              { message_body: 'msg1',
+                message_attributes: { attr: 'attr1' },
+                message_group_id: 'my group',
+                message_deduplication_id: 'my id' }
+            ]
+          )
         end
       end
     end
 
     it 'accepts an array of string' do
-      expect(sqs).to receive(:send_message_batch).with(hash_including(entries: [{ id: '0', message_body: 'msg1' }, { id: '1', message_body: 'msg2' }]))
+      expect(sqs).to(
+        receive(:send_message_batch).with(
+          hash_including(entries: [{ id: '0', message_body: 'msg1' }, { id: '1', message_body: 'msg2' }])
+        )
+      )
 
       subject.send_messages(%w(msg1 msg2))
     end
@@ -189,9 +196,13 @@ RSpec.describe Shoryuken::Queue do
     before do
       attribute_response = double 'Aws::SQS::Types::GetQueueAttributesResponse'
 
-      allow(attribute_response).to receive(:attributes).and_return('FifoQueue' => fifo.to_s, 'ContentBasedDeduplication' => 'true')
+      allow(attribute_response).to(
+        receive(:attributes).and_return('FifoQueue' => fifo.to_s, 'ContentBasedDeduplication' => 'true')
+      )
       allow(subject).to receive(:url).and_return(queue_url)
-      allow(sqs).to receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response)
+      allow(sqs).to(
+        receive(:get_queue_attributes).with(queue_url: queue_url, attribute_names: ['All']).and_return(attribute_response)
+      )
     end
 
     context 'when queue is FIFO' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shoryuken
 version: !ruby/object:Gem::Version
-  version: 3.1.4
+  version: 3.1.5
 platform: ruby
 authors:
 - Pablo Cantero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-14 00:00:00.000000000 Z
+date: 2017-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler