Merge lp:~jfb-tempo-consulting/unifield-server/US-7030 into lp:unifield-server

[jftempo]

=== modified file 'bin/addons/sync_client/rpc.py'
--- bin/addons/sync_client/rpc.py	2017-05-09 15:04:38 +0000
+++ bin/addons/sync_client/rpc.py	2020-02-06 09:41:40 +0000
@@ -9,7 +9,7 @@
 import socket
 import zlib
 import xmlrpclib
-from timeout_transport import TimeoutTransport
+from timeout_transport import TimeoutTransport, TimeoutSafeTransport
 from osv import osv
 from tools.translate import _
 import tools
@@ -106,7 +106,7 @@
                 error = e
                 if i < self.retry:
                     retry = True
-                    self._logger.debug("retry to connect %s, error : %s" ,i, e)
+                    self._logger.warn("retry to connect %s, error : %s" ,i, e)
                 i += 1
         if error:
             raise osv.except_osv(_('Error!'), "Unable to proceed for the following reason:\n%s" % (e.faultCode if hasattr(e, 'faultCode') else tools.ustr(e)))
@@ -120,16 +120,21 @@
 
     def __init__(self, hostname, port=8070, timeout=10.0, retry=0):
         XmlRPCConnector.__init__(self, hostname, port, timeout=timeout, retry=retry)
+        self.timeout = timeout
         self.url = 'https://%s:%s/xmlrpc' % (self.hostname, self.port)
 
     def send(self, service_name, method, *args):
         url = '%s/%s' % (self.url, service_name)
         # Decide whether to accept self-signed certificates
         ctx = ssl.create_default_context()
+        transport = TimeoutSafeTransport(timeout=self.timeout)
+        # Enable gzip on all payloads
+        transport.encode_threshold = 0
         if not tools.config.get('secure_verify', True):
             ctx.check_hostname = False
             ctx.verify_mode = ssl.CERT_NONE
-        service = xmlrpclib.ServerProxy(url, allow_none=1, context=ctx)
+        service = xmlrpclib.ServerProxy(url, allow_none=1, context=ctx, transport=transport)
+
         return self._send(service, method, *args)
 
 class NetRPC_Exception(Exception):
@@ -392,7 +397,7 @@
         return arguments
 
     def exists(self, oid, context=None):
-        # TODO: Fucking bug, we can't use the read(fields=['id']), 
+        # TODO: Fucking bug, we can't use the read(fields=['id']),
         # because the server returns a positive value but the record does not exist
         # into the database
         value = self.search_count([('id', '=', oid)], context=context)

=== modified file 'bin/addons/sync_client/timeout_transport.py'
--- bin/addons/sync_client/timeout_transport.py	2017-05-09 15:04:38 +0000
+++ bin/addons/sync_client/timeout_transport.py	2020-02-06 09:41:40 +0000
@@ -30,6 +30,9 @@
         if self.timeout is not None:
             self.sock.settimeout(self.timeout)
 
+    def set_timeout(self, timeout):
+        self.timeout = timeout
+
 class TimeoutSafeTransport(xmlrpclib.SafeTransport):
 
     def __init__(self, timeout=None, *args, **kwargs):
@@ -37,7 +40,8 @@
         self.timeout = timeout
 
     def make_connection(self, host):
-        self._connection = host, TimeoutHTTPSConnection(host)
+        chost, self._extra_headers, _ = self.get_host_info(host)
+        self._connection = host, TimeoutHTTPSConnection(chost)
         self._connection[1].set_timeout(self.timeout)
         return self._connection[1]