Commit 52bf5b0e authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Merge pull request #3159 from peikk0/allow-redis-via-socket

Allow connection to Redis via unix socket
parents 1c2a7bc3 67a61c80
...@@ -4,19 +4,19 @@ config_file = Rails.root.join('config', 'resque.yml') ...@@ -4,19 +4,19 @@ config_file = Rails.root.join('config', 'resque.yml')
resque_url = if File.exists?(config_file) resque_url = if File.exists?(config_file)
YAML.load_file(config_file)[Rails.env] YAML.load_file(config_file)[Rails.env]
else else
"localhost:6379" "redis://localhost:6379"
end end
Sidekiq.configure_server do |config| Sidekiq.configure_server do |config|
config.redis = { config.redis = {
url: "redis://#{resque_url}", url: resque_url,
namespace: 'resque:gitlab' namespace: 'resque:gitlab'
} }
end end
Sidekiq.configure_client do |config| Sidekiq.configure_client do |config|
config.redis = { config.redis = {
url: "redis://#{resque_url}", url: resque_url,
namespace: 'resque:gitlab' namespace: 'resque:gitlab'
} }
end end
development: localhost:6379 development: redis://localhost:6379
test: localhost:6379 test: redis://localhost:6379
production: redis.example.com:6379 production: redis://redis.example.com:6379
...@@ -288,7 +288,7 @@ a different host, you can configure its connection string via the ...@@ -288,7 +288,7 @@ a different host, you can configure its connection string via the
`config/resque.yml` file. `config/resque.yml` file.
# example # example
production: redis.example.tld:6379 production: redis://redis.example.tld:6379
## Custom SSH Connection ## Custom SSH Connection
......
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