bgme/mastodon
1
0
Fork 0
mirror of https://github.com/yingziwu/mastodon.git synced 2026-02-18 16:23:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

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 bgme
parent 72cf00f845
commit 6ec529fa5f
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