Fix timeouts in Synchrony driver. Credits: @badboy.

Author: djanowski

lib/redis/connection/synchrony.rb

@@ -9,6 +9,8 @@ module Connection
     class RedisClient < EventMachine::Connection
       include EventMachine::Deferrable
 
+      attr_accessor :timeout
+
       def post_init
         @req = nil
         @connected = false
@@ -44,6 +46,9 @@ def receive_data(data)
 
       def read
         @req = EventMachine::DefaultDeferrable.new
+        if @timeout > 0
+          @req.timeout(@timeout, :timeout)
+        end
         EventMachine::Synchrony.sync @req
       end
 
@@ -96,7 +101,7 @@ def connected?
       end
 
       def timeout=(timeout)
-        @timeout = timeout
+        @connection.timeout = timeout
       end
 
       def disconnect
@@ -115,6 +120,8 @@ def read
           payload
         elsif type == :error
           raise payload
+        elsif type == :timeout
+          raise TimeoutError
         else
           raise "Unknown type #{type.inspect}"
         end