Commit 3a93bae2 authored by Gabriel Mazetto's avatar Gabriel Mazetto

Few minor fixes to Redis params order and commented out sentinel config

in resque.yml.example

Codestyle changes
parent 67ae8adc
...@@ -3,13 +3,13 @@ ...@@ -3,13 +3,13 @@
# #
development: development:
url: redis://localhost:6379 url: redis://localhost:6379
sentinels: # sentinels:
- # -
host: localhost # host: localhost
port: 26380 # point to sentinel, not to redis port # port: 26380 # point to sentinel, not to redis port
- # -
host: slave2 # host: slave2
port: 26381 # point to sentinel, not to redis port # port: 26381 # point to sentinel, not to redis port
test: test:
url: redis://localhost:6379 url: redis://localhost:6379
production: production:
...@@ -18,13 +18,13 @@ production: ...@@ -18,13 +18,13 @@ production:
## ##
# Redis + Sentinel (for HA) # 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 # http://redis.io/topics/sentinel
# #
# You must specify a list of a few sentinels that will handle client connection # 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 # please read here for more information: https://github.com/redis/redis-rb#sentinel-support
## ##
#url: redis://master:6379 # url: redis://master:6379
# sentinels: # sentinels:
# - # -
# host: slave1 # host: slave1
......
...@@ -4,7 +4,6 @@ require_relative 'redis' unless defined?(Gitlab::Redis) ...@@ -4,7 +4,6 @@ require_relative 'redis' unless defined?(Gitlab::Redis)
module Gitlab module Gitlab
module MailRoom module MailRoom
class << self class << self
def enabled? def enabled?
config[:enabled] && config[:address] config[:enabled] && config[:address]
......
...@@ -53,18 +53,19 @@ module Gitlab ...@@ -53,18 +53,19 @@ module Gitlab
def redis_store_options def redis_store_options
config = raw_config_hash 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' if redis_uri.scheme == 'unix'
# Redis::Store does not handle Unix sockets well, so let's do it for them # Redis::Store does not handle Unix sockets well, so let's do it for them
config[:path] = redis_uri.path config[:path] = redis_uri.path
config
else else
redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(config[:url]) redis_hash = ::Redis::Store::Factory.extract_host_options_from_uri(redis_url)
config.merge!(redis_hash) # order is important here, sentinels must be after the connection keys.
# {url: ..., port: ..., sentinels: [...]}
redis_hash.merge(config)
end end
config.delete(:url)
config
end end
def raw_config_hash def raw_config_hash
......
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