[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [34537] trunk/blender/release/scripts/io/ netrender: [#25671] Network Render freezes/blocks blender

[Martin Poirier]

Revision: 34537
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=34537
Author:   theeth
Date:     2011-01-28 00:00:10 +0000 (Fri, 28 Jan 2011)
Log Message:
-----------
[#25671] Network Render freezes/blocks blender

Decreasing timeout and increasing refresh period

Modified Paths:
--------------
    trunk/blender/release/scripts/io/netrender/ui.py
    trunk/blender/release/scripts/io/netrender/utils.py

Modified: trunk/blender/release/scripts/io/netrender/ui.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/ui.py	2011-01-27 21:44:56 UTC (rev 34536)
+++ trunk/blender/release/scripts/io/netrender/ui.py	2011-01-28 00:00:10 UTC (rev 34537)
@@ -71,11 +71,11 @@
     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
 

Modified: trunk/blender/release/scripts/io/netrender/utils.py
===================================================================
--- trunk/blender/release/scripts/io/netrender/utils.py	2011-01-27 21:44:56 UTC (rev 34536)
+++ trunk/blender/release/scripts/io/netrender/utils.py	2011-01-28 00:00:10 UTC (rev 34537)
@@ -130,7 +130,7 @@
 
         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 @@
             return None
 
     try:
-        conn = http.client.HTTPConnection(address, port, timeout = 5)
+        conn = http.client.HTTPConnection(address, port, timeout = timeout)
 
         if conn:
             if clientVerifyVersion(conn):