[Bf-extensions-cvs] SVN commit: /data/svn/bf-extensions [3871] trunk/py/scripts/addons/ netrender/utils.py: Fix #32892: network render slave freezes on OS X when master IP not found.
Brecht Van Lommel
brechtvanlommel at pandora.be
Fri Oct 19 18:05:54 CEST 2012
Revision: 3871
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-extensions&revision=3871
Author: blendix
Date: 2012-10-19 16:05:52 +0000 (Fri, 19 Oct 2012)
Log Message:
-----------
Fix #32892: network render slave freezes on OS X when master IP not found.
Modified Paths:
--------------
trunk/py/scripts/addons/netrender/utils.py
Modified: trunk/py/scripts/addons/netrender/utils.py
===================================================================
--- trunk/py/scripts/addons/netrender/utils.py 2012-10-19 14:05:15 UTC (rev 3870)
+++ trunk/py/scripts/addons/netrender/utils.py 2012-10-19 16:05:52 UTC (rev 3871)
@@ -185,7 +185,7 @@
conn = HTTPConnection(address, port, timeout = timeout)
if conn:
- if clientVerifyVersion(conn):
+ if clientVerifyVersion(conn, timeout):
return conn
else:
conn.close()
@@ -198,8 +198,8 @@
print(err)
return None
-def clientVerifyVersion(conn):
- with ConnectionContext():
+def clientVerifyVersion(conn, timeout):
+ with ConnectionContext(timeout):
conn.request("GET", "/version")
response = conn.getresponse()
More information about the Bf-extensions-cvs
mailing list