[Erp5-report] r40469 jerome - /erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon Nov 22 15:07:27 2010
New Revision: 40469

URL: http://svn.erp5.org?rev=40469&view=rev
Log:
use oood timeout from preference

Modified:
    erp5/trunk/products/ERP5OOo/Document/OOoDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/OOoDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/OOoDocument.py?rev=40469&r1=40468&r2=40469&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] (original)
+++ erp5/trunk/products/ERP5OOo/Document/OOoDocument.py [utf8] Mon Nov 22 15:07:27 2010
@@ -97,7 +97,9 @@ class OOoServerProxy(ServerProxy):
             ' conversion server host and port is not defined in preferences')
 
     uri = 'http://%s:%d' % (address, port)
-    transport = TimeoutTransport(timeout=OOO_SERVER_PROXY_TIMEOUT, scheme='http')
+    timeout = preference_tool.getPreferredOoodocServerTimeout() \
+                    or OOO_SERVER_PROXY_TIMEOUT
+    transport = TimeoutTransport(timeout=timeout, scheme='http')
 
     ServerProxy.__init__(self, uri, allow_none=True, transport=transport)