From 6a334042ee567acb24a1b6ab31a4cca759795282 Mon Sep 17 00:00:00 2001
From: Mike Perham <mperham@gmail.com>
Date: Tue, 9 Jun 2020 15:14:02 -0700
Subject: [PATCH] Migrate to exists? for redis-rb 4.2, fixes #4591

---
 Changes.md              | 3 ++-
 Gemfile.lock            | 8 ++++----
 lib/sidekiq/api.rb      | 2 +-
 lib/sidekiq/launcher.rb | 2 +-
 sidekiq.gemspec         | 2 +-
 test/test_api.rb        | 2 +-
 test/test_web.rb        | 2 +-
 7 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Changes.md b/Changes.md
index 92ccfca0a..a26a87625 100644
--- a/Changes.md
+++ b/Changes.md
@@ -9,7 +9,8 @@ HEAD
 - Ensure `Rack::ContentLength` is loaded as middleware for correct Web UI responses [#4541]
 - Avoid exception dumping SSL store in Redis connection logging [#4532]
 - Better error messages in Sidekiq::Client [#4549]
-- Vendor rack-protection/authenticity_token middleware [#4588]
+- Remove rack-protection, reimplement CSRF protection [#4588]
+- Require redis-rb 4.2.0
 
 6.0.7
 ---------
diff --git a/Gemfile.lock b/Gemfile.lock
index 96a13630a..ecfb4cd5f 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    sidekiq (6.0.7)
+    sidekiq (6.1.0)
       connection_pool (>= 2.2.2)
       rack (~> 2.0)
-      redis (>= 4.1.0)
+      redis (>= 4.2.0)
 
 GEM
   remote: https://rubygems.org/
@@ -74,7 +74,7 @@ GEM
     byebug (11.1.1)
     coderay (1.1.2)
     concurrent-ruby (1.1.6)
-    connection_pool (2.2.2)
+    connection_pool (2.2.3)
     crass (1.0.6)
     docile (1.3.2)
     erubi (1.9.0)
@@ -146,7 +146,7 @@ GEM
       thor (>= 0.20.3, < 2.0)
     rainbow (3.0.0)
     rake (13.0.1)
-    redis (4.1.3)
+    redis (4.2.0)
     redis-namespace (1.7.0)
       redis (>= 3.0.4)
     rexml (3.2.4)
diff --git a/lib/sidekiq/api.rb b/lib/sidekiq/api.rb
index 765eb732c..6bcb70fa0 100644
--- a/lib/sidekiq/api.rb
+++ b/lib/sidekiq/api.rb
@@ -921,7 +921,7 @@ def each
         procs = conn.sscan_each("processes").to_a
         procs.sort.each do |key|
           valid, workers = conn.pipelined {
-            conn.exists(key)
+            conn.exists?(key)
             conn.hgetall("#{key}:workers")
           }
           next unless valid
diff --git a/lib/sidekiq/launcher.rb b/lib/sidekiq/launcher.rb
index e0703aab9..e29d25797 100644
--- a/lib/sidekiq/launcher.rb
+++ b/lib/sidekiq/launcher.rb
@@ -157,7 +157,7 @@ def ❤
         _, exists, _, _, msg = Sidekiq.redis { |conn|
           conn.multi {
             conn.sadd("processes", key)
-            conn.exists(key)
+            conn.exists?(key)
             conn.hmset(key, "info", to_json, "busy", curstate.size, "beat", Time.now.to_f, "quiet", @done)
             conn.expire(key, 60)
             conn.rpop("#{key}-signals")
diff --git a/sidekiq.gemspec b/sidekiq.gemspec
index 808b57052..c28c8948c 100644
--- a/sidekiq.gemspec
+++ b/sidekiq.gemspec
@@ -14,7 +14,7 @@ Gem::Specification.new do |gem|
   gem.version = Sidekiq::VERSION
   gem.required_ruby_version = ">= 2.5.0"
 
-  gem.add_dependency "redis", ">= 4.1.0"
+  gem.add_dependency "redis", ">= 4.2.0"
   gem.add_dependency "connection_pool", ">= 2.2.2"
   gem.add_dependency "rack", "~> 2.0"
 end
diff --git a/test/test_api.rb b/test/test_api.rb
index 033274ac7..3bde46850 100644
--- a/test/test_api.rb
+++ b/test/test_api.rb
@@ -422,7 +422,7 @@ class WorkerWithTags
 
       Sidekiq.redis do |conn|
         refute conn.smembers('queues').include?('foo')
-        refute conn.exists('queue:foo')
+        refute conn.exists?('queue:foo')
       end
     end
 
diff --git a/test/test_web.rb b/test/test_web.rb
index 69631235c..8d3c90b51 100644
--- a/test/test_web.rb
+++ b/test/test_web.rb
@@ -164,7 +164,7 @@ def perform(a, b)
 
     Sidekiq.redis do |conn|
       refute conn.smembers('queues').include?('foo')
-      refute conn.exists('queue:foo')
+      refute conn.exists?('queue:foo')
     end
   end