diff options
| author | Martin Poirier <theeth@yahoo.com> | 2011-01-28 03:00:10 +0300 |
|---|---|---|
| committer | Martin Poirier <theeth@yahoo.com> | 2011-01-28 03:00:10 +0300 |
| commit | 185f77438567412f0d1061fa973696ee1edb9e2b (patch) | |
| tree | e89e65b3f5e47025284003b2dc0bf36a954ac7f7 /release | |
| parent | a68a44817a7f3c0da43f7349911e6924929ec223 (diff) | |
[#25671] Network Render freezes/blocks blender
Decreasing timeout and increasing refresh period
Diffstat (limited to 'release')
| -rw-r--r-- | release/scripts/io/netrender/ui.py | 4 | ||||
| -rw-r--r-- | release/scripts/io/netrender/utils.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/io/netrender/ui.py b/release/scripts/io/netrender/ui.py index 7bdd5e94fef..fffb8a74e2a 100644 --- a/release/scripts/io/netrender/ui.py +++ b/release/scripts/io/netrender/ui.py @@ -71,11 +71,11 @@ def verify_address(netsettings): global LAST_ADDRESS_TEST init_file() - if LAST_ADDRESS_TEST + 5 < time.time(): + if LAST_ADDRESS_TEST + 30 < time.time(): LAST_ADDRESS_TEST = time.time() try: - conn = clientConnection(netsettings.server_address, netsettings.server_port, scan = False) + conn = clientConnection(netsettings.server_address, netsettings.server_port, scan = False, timeout = 1) except: conn = None diff --git a/release/scripts/io/netrender/utils.py b/release/scripts/io/netrender/utils.py index 1d1bf3143be..065f3c72ed5 100644 --- a/release/scripts/io/netrender/utils.py +++ b/release/scripts/io/netrender/utils.py @@ -130,7 +130,7 @@ def clientScan(report = None): return ("", 8000) # return default values -def clientConnection(address, port, report = None, scan = True): +def clientConnection(address, port, report = None, scan = True, timeout = 5): if address == "[default]": # calling operator from python is fucked, scene isn't in context # if bpy: @@ -144,7 +144,7 @@ def clientConnection(address, port, report = None, scan = True): return None try: - conn = http.client.HTTPConnection(address, port, timeout = 5) + conn = http.client.HTTPConnection(address, port, timeout = timeout) if conn: if clientVerifyVersion(conn): |