From 10d8b77b500e708f39f565f7f020814b4446a419 Mon Sep 17 00:00:00 2001 From: Alexander Simonov Date: Tue, 20 Nov 2012 18:57:45 +0200 Subject: [PATCH 1/2] Clean old rails2 style code --- config/initializers/4_resque.rb | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/config/initializers/4_resque.rb b/config/initializers/4_resque.rb index 2a5721ec..3d167a6a 100644 --- a/config/initializers/4_resque.rb +++ b/config/initializers/4_resque.rb @@ -1,11 +1,9 @@ # Custom Redis configuration -rails_root = ENV['RAILS_ROOT'] || File.dirname(__FILE__) + '/../..' -rails_env = ENV['RAILS_ENV'] || 'development' -config_file = File.join(rails_root, 'config', 'resque.yml') +config_file = Rails.root.join('config', 'resque.yml') if File.exists?(config_file) resque_config = YAML.load_file(config_file) - Resque.redis = resque_config[rails_env] + Resque.redis = resque_config[Rails.env] end # Queues From 18bc873d53e79ef947b4d3fd66413c32e29fc1cb Mon Sep 17 00:00:00 2001 From: Alexander Simonov Date: Tue, 20 Nov 2012 18:59:00 +0200 Subject: [PATCH 2/2] Resque must be running in the own namespace --- config/initializers/4_resque.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/initializers/4_resque.rb b/config/initializers/4_resque.rb index 3d167a6a..419dbe06 100644 --- a/config/initializers/4_resque.rb +++ b/config/initializers/4_resque.rb @@ -5,7 +5,7 @@ if File.exists?(config_file) resque_config = YAML.load_file(config_file) Resque.redis = resque_config[Rails.env] end - +Resque.redis.namespace = 'resque:gitlab' # Queues Resque.watch_queue(PostReceive.instance_variable_get("@queue"))