redis 2.0.5 → 2.0.6

data/lib/redis.rb

@@ -1,7 +1,7 @@
 require 'socket'
 
 class Redis
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 
   class ProtocolError < RuntimeError
     def initialize(reply_type)
@@ -22,10 +22,10 @@ class Redis
 
     url = URI(options.delete(:url) || ENV["REDIS_URL"] || "redis://127.0.0.1:6379/0")
 
-    options[:host]     = url.host
-    options[:port]     = url.port
-    options[:password] = url.password
-    options[:db]       = url.path[1..-1].to_i
+    options[:host]     ||= url.host
+    options[:port]     ||= url.port
+    options[:password] ||= url.password
+    options[:db]       ||= url.path[1..-1].to_i
 
     new(options)
   end

data/lib/redis/client.rb

@@ -52,6 +52,8 @@ class Redis
       without_socket_timeout do
         call(*args)
       end
+    rescue Errno::ECONNRESET
+      retry
     end
 
     def process(*commands)
@@ -104,13 +106,13 @@ class Redis
     end
 
     def without_socket_timeout
-      ensure_connected do
-        begin
-          self.timeout = 0
-          yield
-        ensure
-          self.timeout = @timeout if connected?
-        end
+      connect unless connected?
+
+      begin
+        self.timeout = 0
+        yield
+      ensure
+        self.timeout = @timeout if connected?
       end
     end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 2
   - 0
-  - 5
-  version: 2.0.5
+  - 6
+  version: 2.0.6
 platform: ruby
 authors: 
 - Ezra Zygmuntowicz
@@ -21,7 +21,7 @@ autorequire: redis
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -03:00
+date: 2010-09-07 00:00:00 -03:00
 default_executable: 
 dependencies: []