shoryuken 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9072ce45c134cd9563ee7dddac27bc7d19733cde
-  data.tar.gz: 2b48cb3b0d594ef1111456d0f9101ce154056995
+  metadata.gz: ee01f5dc2129537f640aba700e43c8be0f37e77c
+  data.tar.gz: 54c1fe1a997a29a77939336ca5f8f2c7e691a745
 SHA512:
-  metadata.gz: 62bde57b564da861f90c2a68816a69743766f1120dd146817f884b2d4d2e5e5119dcef8858516b7d2581517a04177ec0edb151a97f254c6185ae9092c96efab2
-  data.tar.gz: e011b7d261eaf6e4b87d7dc322d2f458da09fdcd5074eac90eedb8101c082b2987f303b557ba20d90c89b321a7d4df7d613852890b6888263ccbc8adb1bf77db
+  metadata.gz: 5543a21bcfadc457a3bb7444b27ba97d59c9f238bbc9633a100555154823132f7ee6f3cf233f84743ed553cc69a27f8ddf836515690a120b291ffb8212db8783
+  data.tar.gz: bcdc762ee9e02366ad4194e372ad76e2e7c23f7e5f15129d8c90d6abfa65af337c4900addaf47d14f8f6578e084a6fd84dad478878589e0c3e2912c5851c89f5

data/.gitignore

@@ -24,3 +24,4 @@ shoryuken.yml
 *.pid
 *.log
 .env
+rubocop.html

data/.hound.yml

@@ -1,2 +1,6 @@
-StringLiterals:
-  EnforcedStyle: single_quotes
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+
+java_script:
+  enabled: true

data/.rubocop.yml

@@ -0,0 +1,50 @@
+LineLength:
+  Max: 120
+
+Style/SignalException:
+  Enabled: false
+
+Style/SpaceAroundEqualsInParameterDefault:
+  Enabled: false
+
+Style/Documentation:
+  Enabled: false
+
+Style/ClassAndModuleChildren:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
+  Enabled: false
+
+Metrics/CyclomaticComplexity:
+  Enabled: false
+
+Style/CommentAnnotation:
+  Enabled: false
+
+Metrics/ClassLength:
+  Enabled: false
+
+Metrics/ParameterLists:
+  Enabled: false
+
+Metrics/MethodLength :
+  Enabled: false
+
+Style/PerlBackrefs:
+  Enabled: false
+
+Style/StringLiterals:
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+
+Style/StringLiteralsInInterpolation:
+  EnforcedStyle: single_quotes
+  SupportedStyles:
+    - single_quotes
+    - double_quotes
+
+Lint/UnusedMethodArgument:
+  Enabled: false

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## [v2.0.0] - 2015-09-22
+
+- Allow configuration of SQS/SNS endpoints via environment variables
+ - [#130](https://github.com/phstc/shoryuken/pull/130)
+
+- Expose queue_name in the message object
+  - [#127](https://github.com/phstc/shoryuken/pull/127)
+
+- README updates
+  - [#122](https://github.com/phstc/shoryuken/pull/122)
+  - [#120](https://github.com/phstc/shoryuken/pull/120)

data/Gemfile

@@ -3,4 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in shoryuken.gemspec
 gemspec
 
-gem 'codeclimate-test-reporter', group: :test, require: nil
+group :test do
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'multi_xml'
+end

data/README.md

@@ -36,7 +36,7 @@ If all queues get empty, all processors will be changed to the waiting state and
 
 ### Fetch in batches
 
-To be even more performance and cost efficient, Shoryuken fetches SQS messages in batches, so a single SQS request can fetch up to 10 messages.
+To be even more performant and cost effective, Shoryuken fetches SQS messages in batches, so a single SQS request can fetch up to 10 messages.
 
 ## Requirements
 
@@ -114,7 +114,7 @@ aws:
   access_key_id:      ...       # or <%= ENV['AWS_ACCESS_KEY_ID'] %>
   secret_access_key:  ...       # or <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
   region:             us-east-1 # or <%= ENV['AWS_REGION'] %>
-  receive_message:              # See http://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Queue.html#receive_messages-instance_method
+  receive_message:              # See http://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Client.html#receive_message-instance_method
     # wait_time_seconds: N      # The number of seconds to wait for new messages when polling. Defaults to the #wait_time_seconds defined on the queue
     attribute_names:
       - ApproximateReceiveCount
@@ -132,59 +132,13 @@ The ```aws``` section is used to configure both the Aws objects used by Shoryuke
 - ```account_id``` is used when generating SNS ARNs
 - ```sns_endpoint``` can be used to explicitly override the SNS endpoint
 - ```sqs_endpoint``` can be used to explicitly override the SQS endpoint
-- ```receive_message``` can be used to define the options passed to the http://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Queue.html#receive_messages-instance_method
+- ```receive_message``` can be used to define the options passed to the http://docs.aws.amazon.com/sdkforruby/api/Aws/SQS/Client.html#receive_message-instance_method
 
-### Rails Integration
-
-You can tell Shoryuken to load your Rails application by passing the `-R` or `--rails` flag to the "shoryuken" command.
-
-If you load Rails, and assuming your workers are located in the `app/workers` directory, they will be auto-loaded. This means you don't need to require them explicitly with `-r`.
-
-For middleware and other configuration, you might want to create an initializer:
-
-```ruby
-Shoryuken.configure_server do |config|
-  # Replace Rails logger so messages are logged wherever Shoryuken is logging
-  # Note: this entire block is only run by the processor, so we don't overwrite
-  #       the logger when the app is running as usual.
-  Rails.logger = Shoryuken::Logging.logger
-
-  config.server_middleware do |chain|
-    chain.add Shoryuken::MyMiddleware
-  end
-end
-```
-
-*Note:* In the above case, since we are replacing the Rails logger, it's desired that this initializer runs before other initializers (in case they themselves use the logger). Since by Rails conventions initializers are executed in alphabetical order, this can be achieved by prepending the initializer filename with `00_` (assuming no other initializers alphabetically precede this one).
-
-This feature works for Rails 4+, but needs to be confirmed for older versions.
-
-#### ActiveJob Support
+The ```sns_endpoint``` and ```sqs_endpoint``` Shoryuken-specific options will also fallback to the environment variables ```AWS_SNS_ENDPOINT``` and ```AWS_SQS_ENDPOINT``` respectively, if they are set.
 
-Yes, Shoryuken supports ActiveJob! This means that you can put your jobs in processor-agnostic `ActiveJob::Base` subclasses, and change processors whenever you want (or better yet, switch to Shoryuken from another processor easily!).
-
-It works as expected. Just put your job in `app/jobs`. Here's an example:
-
-```ruby
-class ProcessPhotoJob < ActiveJob::Base
-  queue_as :default
-
-  rescue_from ActiveJob::DeserializationError do |e|
-    Shoryuken.logger.error ex
-    Shoryuken.logger.error ex.backtrace.join("\n")
-  end
-
-  def perform(photo)
-    photo.process_image!
-  end
-end
-```
-
-Delayed mailers, ActiveRecord serialization, etc. all work.
-
-See [ActiveJob docs](http://edgeguides.rubyonrails.org/active_job_basics.html) for more info.
+### Rails Integration
 
-*Note:* When queueing jobs to be performed in the future (e.g when setting the `wait` or `wait_until` ActiveJob options), SQS limits the amount of time to 15 minutes. Shoryuken will raise an exception if you attempt to schedule a job further into the future than this limit.
+[Check the Rails Integration Active Job documention](https://github.com/phstc/shoryuken/wiki/Rails-Integration-Active-Job).
 
 ### Start Shoryuken
 

data/examples/bootstrap_queues.rb

@@ -22,7 +22,7 @@ if sqs.config['endpoint'] =~ /amazonaws.com/
   ).attributes['QueueArn']
 
   attributes = {}
-  attributes['RedrivePolicy'] = %Q{{"maxReceiveCount":"7", "deadLetterTargetArn":"#{dead_letter_queue_arn}"}}
+  attributes['RedrivePolicy'] = %Q({"maxReceiveCount":"7", "deadLetterTargetArn":"#{dead_letter_queue_arn}"})
 
   sqs.set_queue_attributes queue_url: default_queue_url, attributes: attributes
 end

data/lib/shoryuken/cli.rb

@@ -19,7 +19,7 @@ module Shoryuken
     def run(args)
       self_read, self_write = IO.pipe
 
-      %w[INT TERM USR1 USR2 TTIN].each do |sig|
+      %w(INT TERM USR1 USR2 TTIN).each do |sig|
         begin
           trap sig do
             self_write.puts(sig)
@@ -41,14 +41,14 @@ module Shoryuken
       @launcher = Shoryuken::Launcher.new
 
       if callback = Shoryuken.start_callback
-        logger.info "Calling Shoryuken.on_start block"
+        logger.info { 'Calling Shoryuken.on_start block' }
         callback.call
       end
 
       begin
         launcher.run
 
-        while readable_io = IO.select([self_read])
+        while (readable_io = IO.select([self_read]))
           signal = readable_io.first[0].gets.strip
           handle_signal(signal)
         end
@@ -86,7 +86,7 @@ module Shoryuken
 
       files_to_reopen.each do |file|
         begin
-          file.reopen file.path, "a+"
+          file.reopen file.path, 'a+'
           file.sync = true
         rescue ::Exception
         end
@@ -102,7 +102,7 @@ module Shoryuken
     end
 
     def write_pid
-      if path = Shoryuken.options[:pidfile]
+      if (path = Shoryuken.options[:pidfile])
         File.open(path, 'w') do |f|
           f.puts Process.pid
         end
@@ -150,7 +150,7 @@ module Shoryuken
           opts[:verbose] = arg
         end
 
-        o.on '-V', '--version', 'Print version and exit' do |arg|
+        o.on '-V', '--version', 'Print version and exit' do
           puts "Shoryuken #{Shoryuken::VERSION}"
           exit 0
         end
@@ -158,7 +158,7 @@ module Shoryuken
 
       @parser.banner = 'shoryuken [options]'
       @parser.on_tail '-h', '--help', 'Show help' do
-        logger.info @parser
+        logger.info { @parser }
         exit 1
       end
       @parser.parse!(argv)
@@ -166,22 +166,22 @@ module Shoryuken
     end
 
     def handle_signal(sig)
-      logger.info "Got #{sig} signal"
+      logger.info { "Got #{sig} signal" }
 
       case sig
       when 'USR1'
-        logger.info "Received USR1, will soft shutdown down"
+        logger.info { 'Received USR1, will soft shutdown down' }
 
         launcher.stop
 
         exit 0
       when 'TTIN'
         Thread.list.each do |thread|
-          logger.info "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}"
+          logger.info { "Thread TID-#{thread.object_id.to_s(36)} #{thread['label']}" }
           if thread.backtrace
-            logger.info thread.backtrace.join("\n")
+            logger.info { thread.backtrace.join("\n") }
           else
-            logger.info "<no backtrace available>"
+            logger.info { '<no backtrace available>' }
           end
         end
 
@@ -189,9 +189,9 @@ module Shoryuken
         busy   = launcher.manager.instance_variable_get(:@busy).size
         queues = launcher.manager.instance_variable_get(:@queues)
 
-        logger.info "Ready: #{ready}, Busy: #{busy}, Active Queues: #{unparse_queues(queues)}"
+        logger.info { "Ready: #{ready}, Busy: #{busy}, Active Queues: #{unparse_queues(queues)}" }
       else
-        logger.info "Received #{sig}, will shutdown down"
+        logger.info { "Received #{sig}, will shutdown down" }
 
         raise Interrupt
       end

data/lib/shoryuken/client.rb

@@ -5,7 +5,7 @@ module Shoryuken
 
     class << self
       def queues(name)
-        @@queues[name.to_s] ||= sqs_resource.get_queue_by_name(queue_name: name)
+        @@queues[name.to_s] ||= Shoryuken::Queue.new(sqs, name)
       end
 
       def sns
@@ -20,10 +20,6 @@ module Shoryuken
         @sqs ||= Aws::SQS::Client.new(aws_client_options(:sqs_endpoint))
       end
 
-      def sqs_resource
-        @sqs_resource ||= Aws::SQS::Resource.new(client: sqs)
-      end
-
       def topics(name)
         @@topics[name.to_s] ||= Topic.new(name, sns)
       end
@@ -33,8 +29,9 @@ module Shoryuken
 
       private
 
-      def aws_client_options service_endpoint_key
-        explicit_endpoint = Shoryuken.options[:aws][service_endpoint_key]
+      def aws_client_options(service_endpoint_key)
+        environment_endpoint = ENV["AWS_#{service_endpoint_key.to_s.upcase}"]
+        explicit_endpoint = Shoryuken.options[:aws][service_endpoint_key] || environment_endpoint
         options = {}
         options[:endpoint] = explicit_endpoint unless explicit_endpoint.to_s.empty?
         options

data/lib/shoryuken/default_worker_registry.rb

@@ -28,7 +28,7 @@ module Shoryuken
     end
 
     def register_worker(queue, clazz)
-      if worker_class = @workers[queue]
+      if (worker_class = @workers[queue])
         if worker_class.get_shoryuken_options['batch'] == true || clazz.get_shoryuken_options['batch'] == true
           raise ArgumentError, "Could not register #{clazz} for '#{queue}', "\
             "because #{worker_class} is already registered for this queue, "\

data/lib/shoryuken/environment_loader.rb

@@ -10,7 +10,7 @@ module Shoryuken
       load(config_file: (Rails.root + 'config' + 'shoryuken.yml'))
     end
 
-    def initialize options
+    def initialize(options)
       @options = options
     end
 
@@ -19,6 +19,7 @@ module Shoryuken
       load_rails if options[:rails]
       Shoryuken.options.merge!(config_file_options)
       merge_cli_defined_queues
+      prefix_active_job_queue_names
       Shoryuken.options.merge!(options)
       parse_queues
       require_workers
@@ -33,7 +34,7 @@ module Shoryuken
     def config_file_options
       if (path = options[:config_file])
         unless File.exist?(path)
-          Shoryuken.logger.warn "Config file #{path} does not exist"
+          Shoryuken.logger.warn { "Config file #{path} does not exist" }
           path = nil
         end
       end
@@ -48,24 +49,26 @@ module Shoryuken
       # when not explicit supplied
       return if Shoryuken.options[:aws].empty?
 
-      shoryuken_keys = %i(
+      shoryuken_keys = %w(
         account_id
         sns_endpoint
         sqs_endpoint
-        receive_message)
+        receive_message).map(&:to_sym)
 
       aws_options = Shoryuken.options[:aws].reject do |k, v|
         shoryuken_keys.include?(k)
       end
 
+      # assume credentials based authentication
       credentials = Aws::Credentials.new(
         aws_options.delete(:access_key_id),
         aws_options.delete(:secret_access_key))
 
-      aws_options = aws_options.merge(credentials: credentials)
+      # but only if the configuration options have valid values
+      aws_options = aws_options.merge(credentials: credentials) if credentials.set?
 
-      if callback = Shoryuken.aws_initialization_callback
-        Shoryuken.logger.info "Calling Shoryuken.on_aws_initialization block"
+      if (callback = Shoryuken.aws_initialization_callback)
+        Shoryuken.logger.info { 'Calling Shoryuken.on_aws_initialization block' }
         callback.call(aws_options)
       end
 
@@ -82,19 +85,19 @@ module Shoryuken
 
       require 'rails'
       if ::Rails::VERSION::MAJOR < 4
-        require File.expand_path("config/environment.rb")
+        require File.expand_path('config/environment.rb')
         ::Rails.application.eager_load!
       else
         # Painful contortions, see 1791 for discussion
-        require File.expand_path("config/application.rb")
-        ::Rails::Application.initializer "shoryuken.eager_load" do
+        require File.expand_path('config/application.rb')
+        ::Rails::Application.initializer 'shoryuken.eager_load' do
           ::Rails.application.config.eager_load = true
         end
         require 'shoryuken/extensions/active_job_adapter' if defined?(::ActiveJob)
-        require File.expand_path("config/environment.rb")
+        require File.expand_path('config/environment.rb')
       end
 
-      Shoryuken.logger.info "Rails environment loaded"
+      Shoryuken.logger.info { 'Rails environment loaded' }
     end
 
     def merge_cli_defined_queues
@@ -109,6 +112,21 @@ module Shoryuken
       end
     end
 
+    def prefix_active_job_queue_names
+      return unless @options[:rails]
+      return unless Shoryuken.active_job_queue_name_prefixing
+
+      queue_name_prefix = ::ActiveJob::Base.queue_name_prefix
+      queue_name_delimiter = ::ActiveJob::Base.queue_name_delimiter
+
+      # See https://github.com/rails/rails/blob/master/activejob/lib/active_job/queue_name.rb#L27
+      Shoryuken.options[:queues].to_a.map! do |queue_name, weight|
+        name_parts = [queue_name_prefix.presence, queue_name]
+        prefixed_queue_name = name_parts.compact.join(queue_name_delimiter)
+        [prefixed_queue_name, weight]
+      end
+    end
+
     def parse_queue(queue, weight = nil)
       [weight.to_i, 1].max.times { Shoryuken.queues << queue }
     end
@@ -123,7 +141,7 @@ module Shoryuken
       Shoryuken.worker_registry.queues.each do |queue|
         Shoryuken.worker_registry.workers(queue).each do |worker_class|
           if worker_class.instance_method(:perform).arity == 1
-            Shoryuken.logger.warn "[DEPRECATION] #{worker_class.name}#perform(sqs_msg) is deprecated. Please use #{worker_class.name}#perform(sqs_msg, body)"
+            Shoryuken.logger.warn { "[DEPRECATION] #{worker_class.name}#perform(sqs_msg) is deprecated. Please use #{worker_class.name}#perform(sqs_msg, body)" }
 
             worker_class.class_eval do
               alias_method :deprecated_perform, :perform
@@ -142,13 +160,13 @@ module Shoryuken
     end
 
     def validate_queues
-      Shoryuken.logger.warn 'No queues supplied' if Shoryuken.queues.empty?
+      Shoryuken.logger.warn { 'No queues supplied' } if Shoryuken.queues.empty?
 
       Shoryuken.queues.uniq.each do |queue|
         begin
           Shoryuken::Client.queues queue
         rescue Aws::SQS::Errors::NonExistentQueue
-          Shoryuken.logger.warn "AWS Queue '#{queue}' does not exist"
+          Shoryuken.logger.warn { "AWS Queue '#{queue}' does not exist" }
         end
       end
     end
@@ -159,7 +177,7 @@ module Shoryuken
 
       unless defined?(::ActiveJob)
         (all_queues - queues_with_workers).each do |queue|
-          Shoryuken.logger.warn "No worker supplied for '#{queue}'"
+          Shoryuken.logger.warn { "No worker supplied for '#{queue}'" }
         end
       end
     end

data/lib/shoryuken/extensions/active_job_adapter.rb

@@ -37,7 +37,6 @@ module ActiveJob
 
         def message(job, options = {})
           body = job.serialize
-          body = JSON.dump(body) if body.is_a?(Hash)
 
           { message_body: body,
             message_attributes: message_attributes }.merge(options)

data/lib/shoryuken/fetcher.rb

@@ -13,9 +13,10 @@ module Shoryuken
       # AWS limits the batch size by 10
       limit = limit > FETCH_LIMIT ? FETCH_LIMIT : limit
 
-      options = Shoryuken.options[:aws][:receive_message].to_h.dup
+      options = (Shoryuken.options[:aws][:receive_message] || {}).dup
       options[:max_number_of_messages] = limit
       options[:message_attribute_names] = %w(All)
+      options[:attribute_names] = %w(All)
 
       Shoryuken::Client.queues(queue).receive_messages options
     end
@@ -24,14 +25,14 @@ module Shoryuken
       watchdog('Fetcher#fetch died') do
         started_at = Time.now
 
-        logger.debug "Looking for new messages in '#{queue}'"
+        logger.debug { "Looking for new messages in '#{queue}'" }
 
         begin
           batch = Shoryuken.worker_registry.batch_receive_messages?(queue)
           limit = batch ? FETCH_LIMIT : available_processors
 
           if (sqs_msgs = Array(receive_messages(queue, limit))).any?
-            logger.info "Found #{sqs_msgs.size} messages for '#{queue}'"
+            logger.info { "Found #{sqs_msgs.size} messages for '#{queue}'" }
 
             if batch
               @manager.async.assign(queue, patch_sqs_msgs!(sqs_msgs))
@@ -41,7 +42,7 @@ module Shoryuken
 
             @manager.async.rebalance_queue_weight!(queue)
           else
-            logger.debug "No message found for '#{queue}'"
+            logger.debug { "No message found for '#{queue}'" }
 
             @manager.async.pause_queue!(queue)
           end
@@ -50,14 +51,15 @@ module Shoryuken
 
           logger.debug { "Fetcher for '#{queue}' completed in #{elapsed(started_at)} ms" }
         rescue => ex
-          logger.error "Error fetching message: #{ex}"
-          logger.error ex.backtrace.first
+          logger.error { "Error fetching message: #{ex}" }
+          logger.error { ex.backtrace.first }
 
           @manager.async.dispatch
         end
       end
 
     end
+
     private
 
     def patch_sqs_msgs!(sqs_msgs)

data/lib/shoryuken/launcher.rb

@@ -36,7 +36,7 @@ module Shoryuken
 
     def actor_died(actor, reason)
       return if @done
-      logger.warn 'Shoryuken died due to the following error, cannot recover, process exiting'
+      logger.warn { 'Shoryuken died due to the following error, cannot recover, process exiting' }
       exit 1
     end
   end

data/lib/shoryuken/logging.rb

@@ -17,12 +17,10 @@ module Shoryuken
     end
 
     def self.with_context(msg)
-      begin
-        Thread.current[:shoryuken_context] = msg
-        yield
-      ensure
-        Thread.current[:shoryuken_context] = nil
-      end
+      Thread.current[:shoryuken_context] = msg
+      yield
+    ensure
+      Thread.current[:shoryuken_context] = nil
     end
 
     def self.initialize_logger(log_target = STDOUT)

data/lib/shoryuken/manager.rb

@@ -23,7 +23,7 @@ module Shoryuken
     end
 
     def start
-      logger.info 'Starting'
+      logger.info { 'Starting' }
 
       dispatch
     end
@@ -32,8 +32,8 @@ module Shoryuken
       watchdog('Manager#stop died') do
         @done = true
 
-        if callback = Shoryuken.stop_callback
-          logger.info "Calling Shoryuken.on_stop block"
+        if (callback = Shoryuken.stop_callback)
+          logger.info { 'Calling Shoryuken.on_stop block' }
           callback.call
         end
 
@@ -58,7 +58,7 @@ module Shoryuken
 
     def processor_done(queue, processor)
       watchdog('Manager#processor_done died') do
-        logger.info "Process done for '#{queue}'"
+        logger.debug { "Process done for '#{queue}'" }
 
         @threads.delete(processor.object_id)
         @busy.delete processor
@@ -73,7 +73,7 @@ module Shoryuken
 
     def processor_died(processor, reason)
       watchdog("Manager#processor_died died") do
-        logger.error "Process died, reason: #{reason}" unless reason.to_s.empty?
+        logger.error { "Process died, reason: #{reason}" unless reason.to_s.empty? }
 
         @threads.delete(processor.object_id)
         @busy.delete processor
@@ -89,8 +89,8 @@ module Shoryuken
     end
 
     def assign(queue, sqs_msg)
-      watchdog("Manager#assign died") do
-        logger.info "Assigning #{sqs_msg.message_id}"
+      watchdog('Manager#assign died') do
+        logger.debug { "Assigning #{sqs_msg.message_id}" }
 
         processor = @ready.pop
         @busy << processor
@@ -102,7 +102,7 @@ module Shoryuken
     def rebalance_queue_weight!(queue)
       watchdog('Manager#rebalance_queue_weight! died') do
         if (original = original_queue_weight(queue)) > (current = current_queue_weight(queue))
-          logger.info "Increasing '#{queue}' weight to #{current + 1}, max: #{original}"
+          logger.info { "Increasing '#{queue}' weight to #{current + 1}, max: #{original}" }
 
           @queues << queue
         end
@@ -112,7 +112,7 @@ module Shoryuken
     def pause_queue!(queue)
       return if !@queues.include?(queue) || Shoryuken.options[:delay].to_f <= 0
 
-      logger.debug "Pausing '#{queue}' for #{Shoryuken.options[:delay].to_f} seconds, because it's empty"
+      logger.debug { "Pausing '#{queue}' for #{Shoryuken.options[:delay].to_f} seconds, because it's empty" }
 
       @queues.delete(queue)
 
@@ -133,7 +133,7 @@ module Shoryuken
         return
       end
 
-      if queue = next_queue
+      if (queue = next_queue)
         @fetcher.async.fetch(queue, @ready.size)
       else
         logger.debug { 'Pausing fetcher, because all queues are paused' }
@@ -158,7 +158,7 @@ module Shoryuken
       return if stopped?
 
       unless @queues.include? queue
-        logger.debug "Restarting '#{queue}'"
+        logger.debug { "Restarting '#{queue}'" }
 
         @queues << queue
 
@@ -192,7 +192,7 @@ module Shoryuken
 
       unless defined?(::ActiveJob) ||  !Shoryuken.worker_registry.workers(queue).empty?
         # when no worker registered pause the queue to avoid endless recursion
-        logger.debug "Pausing '#{queue}' for #{Shoryuken.options[:delay].to_f} seconds, because no workers registered"
+        logger.debug { "Pausing '#{queue}' for #{Shoryuken.options[:delay].to_f} seconds, because no workers registered" }
 
         after(Shoryuken.options[:delay].to_f) { async.restart_queue!(queue) }
 
@@ -220,7 +220,7 @@ module Shoryuken
       logger.info { "Pausing up to #{delay} seconds to allow workers to finish..." }
 
       after(delay) do
-        watchdog("Manager#hard_shutdown_in died") do
+        watchdog('Manager#hard_shutdown_in died') do
           if @busy.size > 0
             logger.info { "Hard shutting down #{@busy.size} busy workers" }