Pick up REDIS_URL in Redis::Client

redis · May 9, 2012 · 06b2a58 · 06b2a58
1 parent 517e0fe
commit 06b2a58
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/lib/redis.rb b/lib/redis.rb
@@ -10,8 +10,6 @@ def self.deprecate(message, trace = caller[0])
   attr :client
 
   def self.connect(options = {})
-    options = options.dup
-    options[:url] ||= ENV["REDIS_URL"]
     new(options)
   end
 

diff --git a/lib/redis/client.rb b/lib/redis/client.rb
@@ -299,11 +299,13 @@ def ensure_connected
     def _parse_options(options)
       defaults = DEFAULTS.dup
 
+      url = options[:url] || ENV["REDIS_URL"]
+
       # Override defaults from URL if given
-      if options[:url]
+      if url
         require "uri"
 
-        uri = URI(options[:url])
+        uri = URI(url)
 
         if uri.scheme == "unix"
           defaults[:path]   = uri.path