Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/diaspora/diaspora.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Lundqvist <lundqvist.j@gmail.com>2012-05-07 00:04:33 +0400
committerJonas Lundqvist <lundqvist.j@gmail.com>2012-05-08 13:20:56 +0400
commit819bb95dbdabd8baecfacb0939a970e3d43453d0 (patch)
treed2ff3df6ceb5ac88bf1d8d0d4ebb1d9b7f0f0349
parent436ec039c8a832639cf0aa531f92cc0f38ba3ce1 (diff)
reorder so integration2 connects to correct redis port
-rw-r--r--config/initializers/resque.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb
index e4c2b302c..aafd6793c 100644
--- a/config/initializers/resque.rb
+++ b/config/initializers/resque.rb
@@ -6,10 +6,10 @@ if !AppConfig.single_process_mode?
if redis_to_go = ENV["REDISTOGO_URL"]
uri = URI.parse(redis_to_go)
Resque.redis = Redis.new(:host => uri.host, :port => uri.port, :password => uri.password)
- elsif AppConfig[:redis_url]
- Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)
elsif ENV['RAILS_ENV']== 'integration2'
Resque.redis = Redis.new(:host => 'localhost', :port => 6380)
+ elsif AppConfig[:redis_url]
+ Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379)
end
end