diff --git a/config/initializers/redis.rb b/config/initializers/01_redis.rb similarity index 100% rename from config/initializers/redis.rb rename to config/initializers/01_redis.rb diff --git a/config/initializers/breakers.rb b/config/initializers/breakers.rb index e05db08ede4..0cae14c96e9 100644 --- a/config/initializers/breakers.rb +++ b/config/initializers/breakers.rb @@ -28,9 +28,7 @@ require 'evss/letters/service' # Read the redis config, create a connection and a namespace for breakers -redis_config = Rails.application.config_for(:redis).freeze -redis = Redis.new(redis_config[:redis]) -redis_namespace = Redis::Namespace.new('breakers', redis: redis) +redis_namespace = Redis::Namespace.new('breakers', redis: Redis.current) services = [ Appeals::Configuration.instance.breakers_service, diff --git a/config/initializers/rack_attack.rb b/config/initializers/rack_attack.rb index ba014fe7d67..08ff1b73a6f 100644 --- a/config/initializers/rack_attack.rb +++ b/config/initializers/rack_attack.rb @@ -1,8 +1,7 @@ # frozen_string_literal: true class Rack::Attack - REDIS_CONFIG = Rails.application.config_for(:redis).freeze - Rack::Attack.cache.store = Rack::Attack::StoreProxy::RedisStoreProxy.new(Redis.new(REDIS_CONFIG[:redis])) + Rack::Attack.cache.store = Rack::Attack::StoreProxy::RedisStoreProxy.new(Redis.current) throttle('example/ip', limit: 1, period: 5.minutes) do |req| req.ip if req.path == '/v0/limited' diff --git a/rakelib/connectivity.rake b/rakelib/connectivity.rake index f2654f69e68..bd229048768 100644 --- a/rakelib/connectivity.rake +++ b/rakelib/connectivity.rake @@ -7,10 +7,6 @@ # Allows running on development machines Rails.logger = Logger.new(STDOUT) -# For Rx/SM -REDIS_CONFIG = Rails.application.config_for(:redis).freeze -Redis.current = Redis.new(REDIS_CONFIG[:redis]) - class ConnectivityError < StandardError; end # Convenience function that runs a connectivity example and prints out