Commit 765b1831 authored by Douwe Maan's avatar Douwe Maan

Merge branch 'rs-redis-config-paths' into 'master'

Don't depend on `Rails` for Redis configuration file paths

Closes #36514

See merge request !13575
parents e254014d f5cb3ac1
...@@ -7,9 +7,6 @@ module Gitlab ...@@ -7,9 +7,6 @@ module Gitlab
CACHE_NAMESPACE = 'cache:gitlab'.freeze CACHE_NAMESPACE = 'cache:gitlab'.freeze
DEFAULT_REDIS_CACHE_URL = 'redis://localhost:6380'.freeze DEFAULT_REDIS_CACHE_URL = 'redis://localhost:6380'.freeze
REDIS_CACHE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CACHE_CONFIG_FILE'.freeze REDIS_CACHE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CACHE_CONFIG_FILE'.freeze
if defined?(::Rails) && ::Rails.root.present?
DEFAULT_REDIS_CACHE_CONFIG_FILE_NAME = ::Rails.root.join('config', 'redis.cache.yml').freeze
end
class << self class << self
def default_url def default_url
...@@ -22,7 +19,7 @@ module Gitlab ...@@ -22,7 +19,7 @@ module Gitlab
return file_name unless file_name.nil? return file_name unless file_name.nil?
# otherwise, if config files exists for this class, use it # otherwise, if config files exists for this class, use it
file_name = File.expand_path(DEFAULT_REDIS_CACHE_CONFIG_FILE_NAME, __dir__) file_name = config_file_path('redis.cache.yml')
return file_name if File.file?(file_name) return file_name if File.file?(file_name)
# this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent # this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent
......
...@@ -8,9 +8,6 @@ module Gitlab ...@@ -8,9 +8,6 @@ module Gitlab
MAILROOM_NAMESPACE = 'mail_room:gitlab'.freeze MAILROOM_NAMESPACE = 'mail_room:gitlab'.freeze
DEFAULT_REDIS_QUEUES_URL = 'redis://localhost:6381'.freeze DEFAULT_REDIS_QUEUES_URL = 'redis://localhost:6381'.freeze
REDIS_QUEUES_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_QUEUES_CONFIG_FILE'.freeze REDIS_QUEUES_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_QUEUES_CONFIG_FILE'.freeze
if defined?(::Rails) && ::Rails.root.present?
DEFAULT_REDIS_QUEUES_CONFIG_FILE_NAME = ::Rails.root.join('config', 'redis.queues.yml').freeze
end
class << self class << self
def default_url def default_url
...@@ -23,7 +20,7 @@ module Gitlab ...@@ -23,7 +20,7 @@ module Gitlab
return file_name if file_name return file_name if file_name
# otherwise, if config files exists for this class, use it # otherwise, if config files exists for this class, use it
file_name = File.expand_path(DEFAULT_REDIS_QUEUES_CONFIG_FILE_NAME, __dir__) file_name = config_file_path('redis.queues.yml')
return file_name if File.file?(file_name) return file_name if File.file?(file_name)
# this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent # this will force use of DEFAULT_REDIS_QUEUES_URL when config file is absent
......
...@@ -7,9 +7,6 @@ module Gitlab ...@@ -7,9 +7,6 @@ module Gitlab
SESSION_NAMESPACE = 'session:gitlab'.freeze SESSION_NAMESPACE = 'session:gitlab'.freeze
DEFAULT_REDIS_SHARED_STATE_URL = 'redis://localhost:6382'.freeze DEFAULT_REDIS_SHARED_STATE_URL = 'redis://localhost:6382'.freeze
REDIS_SHARED_STATE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_SHARED_STATE_CONFIG_FILE'.freeze REDIS_SHARED_STATE_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_SHARED_STATE_CONFIG_FILE'.freeze
if defined?(::Rails) && ::Rails.root.present?
DEFAULT_REDIS_SHARED_STATE_CONFIG_FILE_NAME = ::Rails.root.join('config', 'redis.shared_state.yml').freeze
end
class << self class << self
def default_url def default_url
...@@ -22,7 +19,7 @@ module Gitlab ...@@ -22,7 +19,7 @@ module Gitlab
return file_name if file_name return file_name if file_name
# otherwise, if config files exists for this class, use it # otherwise, if config files exists for this class, use it
file_name = File.expand_path(DEFAULT_REDIS_SHARED_STATE_CONFIG_FILE_NAME, __dir__) file_name = config_file_path('redis.shared_state.yml')
return file_name if File.file?(file_name) return file_name if File.file?(file_name)
# this will force use of DEFAULT_REDIS_SHARED_STATE_URL when config file is absent # this will force use of DEFAULT_REDIS_SHARED_STATE_URL when config file is absent
......
...@@ -8,9 +8,6 @@ module Gitlab ...@@ -8,9 +8,6 @@ module Gitlab
class Wrapper class Wrapper
DEFAULT_REDIS_URL = 'redis://localhost:6379'.freeze DEFAULT_REDIS_URL = 'redis://localhost:6379'.freeze
REDIS_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CONFIG_FILE'.freeze REDIS_CONFIG_ENV_VAR_NAME = 'GITLAB_REDIS_CONFIG_FILE'.freeze
if defined?(::Rails) && ::Rails.root.present?
DEFAULT_REDIS_CONFIG_FILE_NAME = ::Rails.root.join('config', 'resque.yml').freeze
end
class << self class << self
delegate :params, :url, to: :new delegate :params, :url, to: :new
...@@ -49,13 +46,21 @@ module Gitlab ...@@ -49,13 +46,21 @@ module Gitlab
DEFAULT_REDIS_URL DEFAULT_REDIS_URL
end end
# Return the absolute path to a Rails configuration file
#
# We use this instead of `Rails.root` because for certain tasks
# utilizing these classes, `Rails` might not be available.
def config_file_path(filename)
File.expand_path("../../../config/#{filename}", __dir__)
end
def config_file_name def config_file_name
# if ENV set for wrapper class, use it even if it points to a file does not exist # if ENV set for wrapper class, use it even if it points to a file does not exist
file_name = ENV[REDIS_CONFIG_ENV_VAR_NAME] file_name = ENV[REDIS_CONFIG_ENV_VAR_NAME]
return file_name unless file_name.nil? return file_name unless file_name.nil?
# otherwise, if config files exists for wrapper class, use it # otherwise, if config files exists for wrapper class, use it
file_name = File.expand_path(DEFAULT_REDIS_CONFIG_FILE_NAME, __dir__) file_name = config_file_path('resque.yml')
return file_name if File.file?(file_name) return file_name if File.file?(file_name)
# nil will force use of DEFAULT_REDIS_URL when config file is absent # nil will force use of DEFAULT_REDIS_URL when config file is absent
......
...@@ -17,4 +17,11 @@ describe Gitlab::Redis::Wrapper do ...@@ -17,4 +17,11 @@ describe Gitlab::Redis::Wrapper do
let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL } let(:class_redis_url) { Gitlab::Redis::Wrapper::DEFAULT_REDIS_URL }
include_examples "redis_shared_examples" include_examples "redis_shared_examples"
describe '.config_file_path' do
it 'returns the absolute path to the configuration file' do
expect(described_class.config_file_path('foo.yml'))
.to eq Rails.root.join('config', 'foo.yml').to_s
end
end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment