From 73ff310c990c2da23154e5211e262c8ccbf79ac5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9rome=20Perrin?= <jerome@nexedi.com> Date: Mon, 22 Nov 2010 14:07:27 +0000 Subject: [PATCH] use oood timeout from preference git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@40469 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5OOo/Document/OOoDocument.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/product/ERP5OOo/Document/OOoDocument.py b/product/ERP5OOo/Document/OOoDocument.py index cff79623fa..94aa646637 100644 --- a/product/ERP5OOo/Document/OOoDocument.py +++ b/product/ERP5OOo/Document/OOoDocument.py @@ -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) -- 2.30.9