summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam Mashinchi <adam.mashinchi@silentcircle-llc.com>2014-01-23 08:16:08 -0500
committerAdam Mashinchi <adam.mashinchi@silentcircle-llc.com>2014-01-23 08:16:08 -0500
commitc820bd38e4ae0a910fa93f18be39983b3a4231c4 (patch)
tree3cd6e2375f748fb0a1de93a644cd57d7313a202c
parent25833b1796ec2b0c4319c70f114c060c8e2e33e1 (diff)
downloadredis-py-c820bd38e4ae0a910fa93f18be39983b3a4231c4.tar.gz
Added timeout.
-rw-r--r--redis/connection.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/redis/connection.py b/redis/connection.py
index f2ce878..41c6c96 100644
--- a/redis/connection.py
+++ b/redis/connection.py
@@ -264,7 +264,7 @@ class Connection(object):
"Create a TCP socket connection"
# in 2.6+ try to use IPv6/4 compatibility, else just original code
if hasattr(socket,'create_connection'):
- return socket.create_connection((self.host, self.port))
+ return socket.create_connection((self.host, self.port), self.socket_timeout)
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
sock.settimeout(self.socket_timeout)
sock.connect((self.host, self.port))