shoryuken 3.0.6 → 3.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ed324ac96e13143c24ee4cd81623c80c3558f1bf
-  data.tar.gz: 1f88dd595425bd1c9185a1ce33ab9c8ad4945bcd
+  metadata.gz: 3d0347fa63667fbc483984759877ee74a65919cd
+  data.tar.gz: a06ea715ee035e398cdab792c2647b3e6575f216
 SHA512:
-  metadata.gz: 809cbd0b7dde05a27458d4b44fa3452efb0542a9fda8e2ed06b6bcd1e2ea443b67eaca4e38aa958b6252b40db6ffbda3974afee38f3e018d1f37f6ed4d650aa8
-  data.tar.gz: 04b8353ecbb0d0a5458446a821e86e808c8106aa6e5805d769351a191a34cf5a018a7502edc5cdf99afd1937194b79338d31b08ed6e4b0102c757511b4338dfc
+  metadata.gz: 4a560a9dbc3f31706263ac0f3d15a90b976e7dcc2b040eab0317e0ceb782ea239cea95c8e96d0c6bf0ee7cc4a3d4be30fb2249ddc177c35500a60b463e52beee
+  data.tar.gz: 94776b105d1288009d3b5d93022a6c0fd95a5981daa13925c0453802d90e6215e0d37eb5b044af8ce267559b9becdc49921e9842e6b34b672cb892762f6e4615

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## [v3.0.7] - 2017-05-18
+- Trigger events for dispatch
+ - [#362](https://github.com/phstc/shoryuken/pull/362)
+
+- Log (warn) exponential backoff tries
+ - [#365](https://github.com/phstc/shoryuken/pull/365)
+
+- Fix displaying of long queue names in `shoryuken sqs ls`
+ - [#366](https://github.com/phstc/shoryuken/pull/366)
+
 ## [v3.0.6] - 2017-04-11
 - Fix delay option type
  - [#356](https://github.com/phstc/shoryuken/pull/356)

data/README.md

@@ -13,26 +13,19 @@ Shoryuken _sho-ryu-ken_ is a super-efficient [AWS SQS](https://aws.amazon.com/sq
 
 Yeah, Shoryuken load balances the messages consumption!
 
-Given this configuration:
-
 ```yaml
 concurrency: 25
-delay: 25
+delay: 0
 queues:
   - [high_priority, 6]
   - [normal_priority, 2]
   - [low_priority, 1]
 ```
 
-And supposing all the queues are full of messages, the configuration above will make Shoryuken to process `high_priority` 3 times more than `normal_priority` and 6 times more than `low_priority`,
-splitting the work load among all available processors `concurrency: 25` .
-
-If `high_priority` gets empty, Shoryuken will keep using the 25 processors, but only to process `normal_priority` and `low_priority`.
-
-If `high_priority` receives a new message, Shoryuken will smoothly increase back its weight one by one until it reaches the weight of 6 again.
-
-[If a queue gets empty, Shoryuken will pause checking it for `delay: 25`](https://github.com/phstc/shoryuken/wiki/Shoryuken-options#delay).
+Or you can set them all to 1 for having the same priorities.
 
+- `concurrency` (default 25) is the number of threads you want to make available for processing. 
+- `delay` (default to 0) is the number of seconds to pause fetching from an empty queue. SQS charges per request, pause checking empty queues for a while can be a cost efficient strategy.
 
 ### Fetch in batches
 
@@ -111,11 +104,11 @@ Sample configuration file `shoryuken.yml`.
 
 ```yaml
 concurrency: 25  # The number of allocated threads to process messages. Default 25
-delay: 25        # The delay in seconds to pause a queue when it's empty. Default 0
+delay: 0         # The delay in seconds to pause empty queues. Default 0
 queues:
-  - [high_priority, 6]
-  - [normal_priority, 2]
-  - [low_priority, 1]
+  - [queue1, 1]
+  - [queue2, 1]
+  - [queue3, 1]
 ```
 
 #### AWS Configuration

data/bin/cli/base.rb

@@ -25,10 +25,8 @@ module Shoryuken
         end
 
         def print_format_column(column, size)
-          size = 40 if size > 40
           size_with_padding = size + 4
           column = column.to_s.ljust(size_with_padding)
-          column = "#{column[0...size - 2]}.." if column.size > size_with_padding
           column
         end
 

data/lib/shoryuken.rb

@@ -35,6 +35,7 @@ module Shoryuken
     timeout: 8,
     lifecycle_events: {
       startup: [],
+      dispatch: [],
       quiet: [],
       shutdown: []
     },

data/lib/shoryuken/manager.rb

@@ -73,6 +73,8 @@ module Shoryuken
           return
         end
 
+        fire_event(:dispatch)
+
         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/middleware/server/exponential_backoff_retry.rb

@@ -12,7 +12,7 @@ module Shoryuken
 
           started_at = Time.now
           yield
-        rescue
+        rescue => ex
           retry_intervals = worker.class.get_shoryuken_options['retry_intervals']
 
           if retry_intervals.nil? || !handle_failure(sqs_msg, started_at, retry_intervals)
@@ -20,6 +20,10 @@ module Shoryuken
             # This allows custom middleware (like exception notifiers) to be aware of the unhandled failure.
             raise
           end
+
+          logger.warn { "Message #{sqs_msg.message_id} will attempt retry due to error: #{ex.message}" }
+          # since we didn't raise, lets log the backtrace for debugging purposes.
+          logger.debug ex.backtrace.join("\n") unless ex.backtrace.nil?
         end
 
         private

data/lib/shoryuken/version.rb

@@ -1,3 +1,3 @@
 module Shoryuken
-  VERSION = '3.0.6'.freeze
+  VERSION = '3.0.7'.freeze
 end

data/spec/shoryuken/manager_spec.rb

@@ -55,6 +55,13 @@ RSpec.describe Shoryuken::Manager do
     end
   end
 
+  describe '#dispatch_now' do
+    it 'fires a dispatch event' do
+      expect(subject).to receive(:fire_event).with(:dispatch).once
+      subject.send(:dispatch_now)
+    end
+  end
+
   describe '#dispatch_batch' do
     it 'assings batch as a single message' do
       q = polling_strategy.next_queue

metadata

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