From 499119025af8a2b3365e48e74c45140d7b8e0db4 Mon Sep 17 00:00:00 2001
From: Brecht Van Lommel <brechtvanlommel@pandora.be>
Date: Fri, 19 Oct 2012 16:05:52 +0000
Subject: [PATCH] Fix #32892: network render slave freezes on OS X when master
IP not found.
---
netrender/utils.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/netrender/utils.py b/netrender/utils.py
index ac219210a..df3f00e42 100644
--- a/netrender/utils.py
+++ b/netrender/utils.py
@@ -185,7 +185,7 @@ def clientConnection(netsettings, report = None, scan = True, timeout = 5):
conn = HTTPConnection(address, port, timeout = timeout)
if conn:
- if clientVerifyVersion(conn):
+ if clientVerifyVersion(conn, timeout):
return conn
else:
conn.close()
@@ -198,8 +198,8 @@ def clientConnection(netsettings, report = None, scan = True, timeout = 5):
print(err)
return None
-def clientVerifyVersion(conn):
- with ConnectionContext():
+def clientVerifyVersion(conn, timeout):
+ with ConnectionContext(timeout):
conn.request("GET", "/version")
response = conn.getresponse()
--
GitLab