Unify redis initialization

REDISTOGO_URL is now deprecated in favor of REDIS_URL which is supported by the redis gem too.

1 files changed, 1 insertions, 6 deletions

diff --git a/config/unicorn.rb b/config/unicorn.rb
index 7d943d226..7c6810b7e 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -47,12 +47,7 @@ after_fork do |server, worker|
 
   # copy pasta from resque.rb because i'm a bad person
   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)
-    end
+    Resque.redis = AppConfig.get_redis_instance
   end
 
   # Enable this line to have the workers run as different user/group