Skip to content
Snippets Groups Projects
Commit 27a93550 authored by Valery Sizov's avatar Valery Sizov
Browse files

Merge branch 'gitlab-org/gitlab-ci#9' into '4-3-stable'

Support unix sockets for redis connection in sidekiq in branch 4-3-stable

Backward incompatibility regarding config/resque.yml - the schema is required now.
Because of this patch makes it behaving the same way it works in gitlab-ce, I think it is fair enough to handle it here similarly.

See merge request !4
parents 267edb06 0558aed7
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -4,19 +4,19 @@ config_file = Rails.root.join('config', 'resque.yml')
resque_url = if File.exists?(config_file)
YAML.load_file(config_file)[Rails.env]
else
"localhost:6379"
"redis://localhost:6379"
end
 
Sidekiq.configure_server do |config|
config.redis = {
url: "redis://#{resque_url}",
url: resque_url,
namespace: 'resque:gitlab_ci'
}
end
 
Sidekiq.configure_client do |config|
config.redis = {
url: "redis://#{resque_url}",
url: resque_url,
namespace: 'resque:gitlab_ci'
}
end
end
\ No newline at end of file
development: localhost:6379
test: localhost:6379
production: redis.example.com:6379
development: redis://localhost:6379
test: redis://localhost:6379
production: redis://redis.example.com:6379
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment