Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender-addons.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@pandora.be>2012-10-19 20:05:52 +0400
committerBrecht Van Lommel <brechtvanlommel@pandora.be>2012-10-19 20:05:52 +0400
commit499119025af8a2b3365e48e74c45140d7b8e0db4 (patch)
treed2e6b11a588a6c135bb5d3681e2602537aa60d44 /netrender
parent010062c4c7e08d7f320cfc2a34073b563a490ef3 (diff)
Fix #32892: network render slave freezes on OS X when master IP not found.
Diffstat (limited to 'netrender')
-rw-r--r--netrender/utils.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/netrender/utils.py b/netrender/utils.py
index ac219210..df3f00e4 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()