mirror of https://github.com/mastodon/mastodon
Revert bad merge change
This commit is contained in:
parent
b0f1b71779
commit
eb744032dc
|
@ -52,7 +52,7 @@ REDIS_CACHE_PARAMS = {
|
||||||
driver: :hiredis,
|
driver: :hiredis,
|
||||||
url: ENV['CACHE_REDIS_URL'],
|
url: ENV['CACHE_REDIS_URL'],
|
||||||
expires_in: 10.minutes,
|
expires_in: 10.minutes,
|
||||||
namespace: cache_namespace,
|
namespace: "#{cache_namespace}:7.1",
|
||||||
connect_timeout: 5,
|
connect_timeout: 5,
|
||||||
pool: {
|
pool: {
|
||||||
size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
|
size: Sidekiq.server? ? Sidekiq[:concurrency] : Integer(ENV['MAX_THREADS'] || 5),
|
||||||
|
|
Loading…
Reference in New Issue