shoryuken 3.1.0 → 3.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 779c3e9c7f708f0a6dccb3e8b0c9f7e2490b25e1
-  data.tar.gz: bf260a2793ff8c07ddfb670832ba5f12af8d85d9
+  metadata.gz: e3626c435f7da14e0880fabb7faf65e397aa82e0
+  data.tar.gz: 37461e552bc0566e3edd7a79a9dbbe92bbdbb5a2
 SHA512:
-  metadata.gz: 1f3e7a4b668c929daa1b5424b7a8ab7f028238b3f6dfe0e812351991bbc37923b58491760df6e4ed4921624cd4954761daeac257c6a540fd193d160d121044de
-  data.tar.gz: 02f2bf2e813cbe1624ae83d16936196ecf523fe8d3773f9b0c39813aa0822d3c71fd273ee01a63072c20d86bf05f4c1a775eda3fae41cec4bf55ea567f772aef
+  metadata.gz: 2a0b1138fcfaf8453e9ae9770dd8f70f4d5db75b81c5b66d5ca740cc92eefd585c7c396bce94a6401527c4465a5d8aa3bdfcfa00ab001567491a45c564e0d993
+  data.tar.gz: 64dfb7449d054cdee861632ca32cf09f47215f400b81025ae5d2481dbcc0ab062e780c6b9a47e23ffb0ae3bf697924b965b7a8e048a7b866535d5dc92021e6c0

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [v3.1.1] - 2017-07-02
+
+- Reduce log verbosity introduced in 3.1.0
+ - [#397](https://github.com/phstc/shoryuken/pull/397)
+
+- Try to prevent stack level too deep on Ubuntu
+ - [#396](https://github.com/phstc/shoryuken/pull/396)
+
 ## [v3.1.0] - 2017-07-02
 
 - Add shoryuken sqs delete command

data/lib/shoryuken/manager.rb

@@ -25,19 +25,19 @@ module Shoryuken
     private
 
     def stopped?
-      @done.true? || !Concurrent.global_io_executor.running?
+      @done.true?
     end
 
     def dispatch
       return if stopped?
 
-      if !ready.positive? || (queue = @polling_strategy.next_queue).nil?
+      if ready <= 0 || (queue = @polling_strategy.next_queue).nil?
         return dispatch_later
       end
 
       fire_event(:dispatch)
 
-      logger.info { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{@polling_strategy.active_queues}" }
+      logger.debug { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{@polling_strategy.active_queues}" }
 
       batched_queue?(queue) ? dispatch_batch(queue) : dispatch_single_messages(queue)
 

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.1.0'.freeze
+  VERSION = '3.1.1'.freeze
 end

data/spec/shoryuken/manager_spec.rb

@@ -25,31 +25,47 @@ RSpec.describe Shoryuken::Manager do
     TestWorker.get_shoryuken_options['batch'] = false
   end
 
+  describe '#stop' do
+    specify do
+      allow(subject).to receive(:stopped?).and_return(false, false, true)
+      expect(subject).to receive(:dispatch).thrice.and_call_original
+      expect(subject).to receive(:dispatch_later).once.and_call_original
+      subject.start
+    end
+  end
+
   describe '#start' do
-    xit 'pauses when there are no active queues' do
+    before do
+      # prevent dispatch loop
+      allow(subject).to receive(:stopped?).and_return(false, true)
+    end
+
+    it 'pauses when there are no active queues' do
       expect(polling_strategy).to receive(:next_queue).and_return(nil)
-      expect_any_instance_of(described_class).to receive(:after)
+      expect(subject).to receive(:dispatch_later)
       subject.start
     end
 
-    xit 'calls dispatch_batch if worker wants batches' do
+    it 'calls dispatch_batch if worker wants batches' do
       TestWorker.get_shoryuken_options['batch'] = true
-      expect_any_instance_of(described_class).to receive(:dispatch_batch).with(queue_config_of(queue))
-      expect(subject).to receive(:dispatch_later)
+      expect(subject).to receive(:dispatch_batch).with(queue_config_of(queue))
       subject.start
     end
 
-    xit 'calls dispatch_single_messages if worker wants single messages' do
-      expect_any_instance_of(described_class).to receive(:dispatch_single_messages).
-        with(queue_config_of(queue))
-      expect(subject).to receive(:dispatch_later)
+    it 'calls dispatch_single_messages if worker wants single messages' do
+      expect(subject).to receive(:dispatch_single_messages).with(queue_config_of(queue))
       subject.start
     end
   end
 
   describe '#dispatch' do
-    xit 'fires a dispatch event' do
+    it 'fires a dispatch event' do
+      # prevent dispatch loop
+      allow(subject).to receive(:stopped?).and_return(false, true)
+
       expect(subject).to receive(:fire_event).with(:dispatch)
+      expect(Shoryuken.logger).to_not receive(:info)
+
       subject.send(:dispatch)
     end
   end

metadata

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