Merge pull request #2022 from simonoff/master
Resque must be running in the own namespace
This commit is contained in:
commit
68b119f62f
|
@ -1,13 +1,11 @@
|
||||||
# Custom Redis configuration
|
# Custom Redis configuration
|
||||||
rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..'
|
config_file = Rails.root.join('config', 'resque.yml')
|
||||||
rails_env = ENV['RAILS_ENV'] || 'development'
|
|
||||||
config_file = File.join(rails_root, 'config', 'resque.yml')
|
|
||||||
|
|
||||||
if File.exists?(config_file)
|
if File.exists?(config_file)
|
||||||
resque_config = YAML.load_file(config_file)
|
resque_config = YAML.load_file(config_file)
|
||||||
Resque.redis = resque_config[rails_env]
|
Resque.redis = resque_config[Rails.env]
|
||||||
end
|
end
|
||||||
|
Resque.redis.namespace = 'resque:gitlab'
|
||||||
# Queues
|
# Queues
|
||||||
Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
|
Resque.watch_queue(PostReceive.instance_variable_get("@queue"))
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue