Few minor fixes to Redis params order and commented out sentinel config
in resque.yml.example Codestyle changes
This commit is contained in:
parent
67ae8adc72
commit
3a93bae25f
|
@ -3,13 +3,13 @@
|
|||
#
|
||||
development:
|
||||
url: redis://localhost:6379
|
||||
sentinels:
|
||||
-
|
||||
host: localhost
|
||||
port: 26380 # point to sentinel, not to redis port
|
||||
-
|
||||
host: slave2
|
||||
port: 26381 # point to sentinel, not to redis port
|
||||
# sentinels:
|
||||
# -
|
||||
# host: localhost
|
||||
# port: 26380 # point to sentinel, not to redis port
|
||||
# -
|
||||
# host: slave2
|
||||
# port: 26381 # point to sentinel, not to redis port
|
||||
test:
|
||||
url: redis://localhost:6379
|
||||
production:
|
||||
|
@ -18,17 +18,17 @@ production:
|
|||
##
|
||||
# Redis + Sentinel (for HA)
|
||||
#
|
||||
# Please read instructions carefully before using it as you may loose data:
|
||||
# Please read instructions carefully before using it as you may lose data:
|
||||
# http://redis.io/topics/sentinel
|
||||
#
|
||||
# You must specify a list of a few sentinels that will handle client connection
|
||||
# please read here for more information: https://github.com/redis/redis-rb#sentinel-support
|
||||
##
|
||||
#url: redis://master:6379
|
||||
# sentinels:
|
||||
# -
|
||||
# host: slave1
|
||||
# port: 26379 # point to sentinel, not to redis port
|
||||
# -
|
||||
# host: slave2
|
||||
# port: 26379 # point to sentinel, not to redis port
|
||||
# url: redis://master:6379
|
||||
# sentinels:
|
||||
# -
|
||||
# host: slave1
|
||||
# port: 26379 # point to sentinel, not to redis port
|
||||
# -
|
||||
# host: slave2
|
||||
# port: 26379 # point to sentinel, not to redis port
|
||||
|
|
|
@ -4,7 +4,6 @@ require_relative 'redis' unless defined?(Gitlab::Redis)
|
|||
|
||||
module Gitlab
|
||||
module MailRoom
|
||||
|
||||
class << self
|
||||
def enabled?
|
||||
config[:enabled] && config[:address]
|
||||
|
|
|
@ -53,18 +53,19 @@ module Gitlab
|
|||
|
||||
def redis_store_options
|
||||
config = raw_config_hash
|
||||
redis_url = config.delete(:url)
|
||||
redis_uri = URI.parse(redis_url)
|
||||
|
||||
redis_uri = URI.parse(config[:url])
|
||||
if redis_uri.scheme == 'unix'
|
||||
# Redis::Store does not handle Unix sockets well, so let's do it for them
|
||||
config[:path] = redis_uri.path
|
||||
config
|
||||
else
|
||||
redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(config[:url])
|
||||
config.merge!(redis_hash)
|
||||
redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(redis_url)
|
||||
# order is important here, sentinels must be after the connection keys.
|
||||
# {url: ..., port: ..., sentinels: [...]}
|
||||
redis_hash.merge(config)
|
||||
end
|
||||
|
||||
config.delete(:url)
|
||||
config
|
||||
end
|
||||
|
||||
def raw_config_hash
|
||||
|
|
Loading…
Reference in New Issue