about summary refs log tree commit diff
path: root/config
diff options
context:
space:
mode:
Diffstat (limited to 'config')
-rw-r--r--config/application.rb2
-rw-r--r--config/initializers/redis.rb14
-rw-r--r--config/initializers/sidekiq.rb4
3 files changed, 4 insertions, 16 deletions
diff --git a/config/application.rb b/config/application.rb
index a1ba71f61..64987cfe7 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -35,6 +35,7 @@ require_relative '../lib/paperclip/response_with_limit_adapter'
 require_relative '../lib/terrapin/multi_pipe_extensions'
 require_relative '../lib/mastodon/snowflake'
 require_relative '../lib/mastodon/version'
+require_relative '../lib/mastodon/rack_middleware'
 require_relative '../lib/devise/two_factor_ldap_authenticatable'
 require_relative '../lib/devise/two_factor_pam_authenticatable'
 require_relative '../lib/chewy/strategy/custom_sidekiq'
@@ -164,6 +165,7 @@ module Mastodon
 
     config.middleware.use Rack::Attack
     config.middleware.use Rack::Deflater
+    config.middleware.use Mastodon::RackMiddleware
 
     config.to_prepare do
       Doorkeeper::AuthorizationsController.layout 'modal'
diff --git a/config/initializers/redis.rb b/config/initializers/redis.rb
deleted file mode 100644
index 7573fc9f7..000000000
--- a/config/initializers/redis.rb
+++ /dev/null
@@ -1,14 +0,0 @@
-# frozen_string_literal: true
-
-redis_connection = Redis.new(
-  url: ENV['REDIS_URL'],
-  driver: :hiredis
-)
-
-namespace = ENV.fetch('REDIS_NAMESPACE') { nil }
-
-if namespace
-  Redis.current = Redis::Namespace.new(namespace, redis: redis_connection)
-else
-  Redis.current = redis_connection
-end
diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb
index 19a705ce8..c1327053d 100644
--- a/config/initializers/sidekiq.rb
+++ b/config/initializers/sidekiq.rb
@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require_relative '../../lib/sidekiq_error_handler'
+require_relative '../../lib/mastodon/sidekiq_middleware'
 
 Sidekiq.configure_server do |config|
   config.redis = REDIS_SIDEKIQ_PARAMS
 
   config.server_middleware do |chain|
-    chain.add SidekiqErrorHandler
+    chain.add Mastodon::SidekiqMiddleware
   end
 
   config.server_middleware do |chain|