sidekiq 5.2.4 → 5.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 196f3dd99544e452ff05bef91694c5fad03709698b2f8db7003d68c06f052331
-  data.tar.gz: d99781e4c97a42b38c0cb9f46632190b941d8a332d763aeb4b92755848f94142
+  metadata.gz: e05ebe69a6d3d12f50f741e147e413b78dbc24038f8a22bf5bbdff8cd4a1f1a0
+  data.tar.gz: 45b1a5cdc5bc79fbe35599d6e5942c21590fea0b88d9b5adc8ae3ddc767f65eb
 SHA512:
-  metadata.gz: 8cc76b2d418c6d9025aeede974085a8beb6e24d960a7dc01890ab8233081c99b3bf929411f7605f47f8adeaac034760f74bdb7d10e186dd2ba9b6200e3e5e24e
-  data.tar.gz: e0b6469801595ed80c059a73af86e6fc8d5092666af399d64cec4fc0e7bc0b4fd1a6f0547767540e680050a56c10afbe36388a01a44bb81745e1c57ef6a99954
+  metadata.gz: f582228b5f93aae8c5ba2cc9297f235d420e15fa04cfcffafd60852274e685a1a75809e6f8b24ab00f0ce375faa718fc68d37cb866bd21f291ca11319c895dfe
+  data.tar.gz: fd5790b633e36125a9cdcf3850e6dc9b87872b47899bd3375b89cdf13197951948b1586ba96b0a051f4cb34b8f28d93a3121cd747d01820a14b2ad6192fd89df

data/.travis.yml

@@ -4,7 +4,7 @@ cache: bundler
 services:
   - redis-server
 before_install:
-  - gem update --system
+  - gem install bundler -v '< 2'
 gemfile:
   - gemfiles/rails_4.gemfile
   - gemfiles/rails_5.gemfile

data/Changes.md

@@ -2,6 +2,11 @@
 
 [Sidekiq Changes](https://github.com/mperham/sidekiq/blob/master/Changes.md) | [Sidekiq Pro Changes](https://github.com/mperham/sidekiq/blob/master/Pro-Changes.md) | [Sidekiq Enterprise Changes](https://github.com/mperham/sidekiq/blob/master/Ent-Changes.md)
 
+5.2.5
+---------
+
+- Fix default usage of `config/sidekiq.yml` [#4077, Tensho]
+
 5.2.4
 ---------
 

data/lib/sidekiq.rb

@@ -96,8 +96,8 @@ module Sidekiq
       begin
         yield conn
       rescue Redis::CommandError => ex
-        #2550 Failover can cause the server to become a slave, need
-        # to disconnect and reopen the socket to get back to the master.
+        #2550 Failover can cause the server to become a replica, need
+        # to disconnect and reopen the socket to get back to the primary.
         (conn.disconnect!; retryable = false; retry) if retryable && ex.message =~ /READONLY/
         raise
       end

data/lib/sidekiq/cli.rb

@@ -239,17 +239,22 @@ module Sidekiq
           raise ArgumentError, "No such file #{opts[:config_file]}"
         end
       else
-        if opts[:require] && File.directory?(opts[:require])
-          %w[config/sidekiq.yml config/sidekiq.yml.erb].each do |filename|
-            path = File.expand_path(filename, opts[:require])
-            opts[:config_file] ||= path if File.exist?(path)
-          end
+        config_dir = if File.directory?(opts[:require].to_s)
+          File.join(opts[:require], 'config')
+        else
+          File.join(options[:require], 'config')
+        end
+
+        %w[sidekiq.yml sidekiq.yml.erb].each do |config_file|
+          path = File.join(config_dir, config_file)
+          opts[:config_file] ||= path if File.exist?(path)
         end
       end
 
       # parse config file options
       opts = parse_config(opts[:config_file]).merge(opts) if opts[:config_file]
 
+      # set defaults
       opts[:queues] = Array(opts[:queues]) << 'default' if opts[:queues].nil? || opts[:queues].empty?
       opts[:strict] = true if opts[:strict].nil?
       opts[:concurrency] = Integer(ENV["RAILS_MAX_THREADS"]) if opts[:concurrency].nil? && ENV["RAILS_MAX_THREADS"]

data/lib/sidekiq/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Sidekiq
-  VERSION = "5.2.4"
+  VERSION = "5.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sidekiq
 version: !ruby/object:Gem::Version
-  version: 5.2.4
+  version: 5.2.5
 platform: ruby
 authors:
 - Mike Perham
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-07 00:00:00.000000000 Z
+date: 2019-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis