Skip to content
Snippets Groups Projects
Commit 49911902 authored by Brecht Van Lommel's avatar Brecht Van Lommel
Browse files

Fix #32892: network render slave freezes on OS X when master IP not found.

parent 010062c4
No related branches found
No related tags found
No related merge requests found
......@@ -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()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment