Skip to content

Commit

Permalink
add Redis.exists_return_integer flag and reinstate sidekiq 5.2.10 and… (
Browse files Browse the repository at this point in the history
#3936)

* add Redis.exists_return_integer flag and reinstate sidekiq 5.2.10 and redis 4.5

* move redis gem in Gemfile so gems are in alphabetical order

* update gemfile.next to pull redis gem
  • Loading branch information
yuenmichelle1 authored Aug 25, 2022
1 parent 6b94888 commit ae9a185
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ else
gem 'rails', '~> 5.0'
end
gem 'ranked-model', '~> 0.4.8'
gem 'redis', '~> 4.5'
gem 'restpack_serializer', git: 'https://github.com/zooniverse/restpack_serializer.git', branch: 'panoptes-api-version', ref: 'cef0969cef'
gem 'schema_plus_pg_indexes', '~> 0.1'
gem 'scientist', '~> 1.6.3'
Expand Down
11 changes: 6 additions & 5 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,7 @@ GEM
pundit (2.2.0)
activesupport (>= 3.0.0)
racc (1.6.0)
rack (2.0.9)
rack (2.2.4)
rack-cors (1.1.1)
rack (>= 2.0.0)
rack-protection (2.2.2)
Expand Down Expand Up @@ -338,7 +338,7 @@ GEM
rb-fsevent (0.11.1)
rb-inotify (0.10.1)
ffi (~> 1.0)
redis (4.1.4)
redis (4.5.1)
regexp_parser (2.3.1)
request_store (1.5.1)
rack (>= 1.4)
Expand Down Expand Up @@ -419,11 +419,11 @@ GEM
schema_plus_indexes (~> 0.2, >= 0.2.4)
scientist (1.6.3)
shellany (0.0.1)
sidekiq (5.2.8)
sidekiq (5.2.10)
connection_pool (~> 2.2, >= 2.2.2)
rack (< 2.1.0)
rack (~> 2.0)
rack-protection (>= 1.5.0)
redis (>= 3.3.5, < 5)
redis (~> 4.5, < 4.6.0)
sidekiq-congestion (0.1.1)
congestion (~> 0.1)
sidekiq (>= 3.0)
Expand Down Expand Up @@ -534,6 +534,7 @@ DEPENDENCIES
rack-cors (~> 1.0)
rails (~> 5.0)
ranked-model (~> 0.4.8)
redis (~> 4.5)
restpack_serializer!
rspec
rspec-its
Expand Down
1 change: 1 addition & 0 deletions Gemfile.next.lock
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,7 @@ DEPENDENCIES
rack-cors (~> 1.0)
rails (~> 5.0)
ranked-model (~> 0.4.8)
redis (~> 4.5)
restpack_serializer!
rspec
rspec-its
Expand Down
3 changes: 3 additions & 0 deletions config/initializers/sidekiq.rb
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ def self.redis_url
end
end

require 'redis'
Redis.exists_returns_integer = false

Sidekiq.configure_client do |config|
config.redis = { url: SidekiqConfig.redis_url }
end
Expand Down

0 comments on commit ae9a185

Please sign in to comment.