Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Fix single Redis connection being used across all threads (#18135)

Browse source 
* Fix single Redis connection being used across all Sidekiq threads

* Fix tests
This commit is contained in:
Eugen Rochko 2022-04-28 17:47:34 +02:00 • committed by GitHub
parent 9bf04db23a
commit 3917353645
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
44 changed files with 243 additions and 124 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/controllers/admin/dashboard_controller.rb
View file

@ -2,6 +2,8 @@
module Admin
class DashboardController < BaseController
include Redisable
def index
@system_checks = Admin::SystemCheck.perform
@time_period = (29.days.ago.to_date...Time.now.utc.to_date)
@ -15,10 +17,10 @@ module Admin
def redis_info
@redis_info ||= begin
if Redis.current.is_a?(Redis::Namespace)
Redis.current.redis.info
if redis.is_a?(Redis::Namespace)
redis.redis.info
else
Redis.current.info
redis.info
end
end
end

3
app/controllers/media_proxy_controller.rb
View file

@ -3,6 +3,7 @@
class MediaProxyController < ApplicationController
include RoutingHelper
include Authorization
include Redisable
skip_before_action :store_current_location
skip_before_action :require_functional!
@ -45,7 +46,7 @@ class MediaProxyController < ApplicationController
end
def lock_options
{ redis: Redis.current, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds }
{ redis: redis, key: "media_download:#{params[:id]}", autorelease: 15.minutes.seconds }
end
def reject_media?

3
app/controllers/settings/exports_controller.rb
View file

@ -2,6 +2,7 @@
class Settings::ExportsController < Settings::BaseController
include Authorization
include Redisable
skip_before_action :require_functional!
@ -28,6 +29,6 @@ class Settings::ExportsController < Settings::BaseController
end
def lock_options
{ redis: Redis.current, key: "backup:#{current_user.id}" }
{ redis: redis, key: "backup:#{current_user.id}" }
end
end