Merge pull request redis#113 from mschulkind/master.

Proper connected status tracking to avoid deadlocks

lib/redis/connection/synchrony.rb

@@ -10,13 +10,19 @@ class RedisClient < EventMachine::Connection
 
       def post_init
         @req = nil
+        @connected = false
         @reader = ::Hiredis::Reader.new
       end
 
       def connection_completed
+        @connected = true
         succeed
       end
 
+      def connected?
+        @connected
+      end
+
       def receive_data(data)
         @reader.feed(data)
 
@@ -39,6 +45,7 @@ def send(data)
       end
 
       def unbind
+        @connected = false
         if @req
           @req.fail [:error, Errno::ECONNRESET]
           @req = nil
@@ -53,12 +60,11 @@ class Synchrony
 
       def initialize
         @timeout = 5_000_000
-        @state = :disconnected
         @connection = nil
       end
 
       def connected?
-        @state == :connected
+        @connection && @connection.connected?
       end
 
       def timeout=(usecs)
@@ -79,7 +85,6 @@ def connect_unix(path, timeout)
       end
 
       def disconnect
-        @state = :disconnected
         @connection.close_connection
         @connection = nil
       end
@@ -105,7 +110,6 @@ def read
       def setup_connect_callbacks(conn, f)
         conn.callback do
           @connection = conn
-          @state = :connected
           f.resume conn
         end