tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki 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
44 changed files with 243 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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?