[Sugar-devel] [PATCH] Time out on registration process to prevent indefinite UI hang (SL#2289)

[Tomeu Vizoso]

On Sun, Sep 19, 2010 at 20:28, Dipankar Patro <dipankar at seeta.in> wrote:
> Registration with the school server is currently done synchronously.
> To prevent the UI from hanging indefinitely, if the school server is reachable
> but unresponsive, we add an explicit timeout.
>
> Reviewed-By: Sascha Silbe <sascha-pgp at silbe.org>
> ---
>  src/jarabe/desktop/schoolserver.py |   27 ++++++++++++++++++++++++---
>  1 files changed, 24 insertions(+), 3 deletions(-)
>
> v2 was Reviewed by: Sascha Silbe <sascha-pgp at silbe.org>
> v2->v3: Rebased on current mainline/master
>
> diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py
> index a05f56c..a1c8c26 100644
> --- a/src/jarabe/desktop/schoolserver.py
> +++ b/src/jarabe/desktop/schoolserver.py
> @@ -16,8 +16,9 @@
>
>  import logging
>  from gettext import gettext as _
> -from xmlrpclib import ServerProxy, Error
> +import xmlrpclib
>  import socket
> +import httplib
>  import os
>  from string import ascii_uppercase
>  import random
> @@ -30,6 +31,7 @@ from sugar import env
>  from sugar.profile import get_profile
>
>  REGISTER_URL = 'http://schoolserver:8080/'
> +REGISTER_TIMEOUT = 8
>
>  def generate_serial_number():
>     """  Generates a serial number based on 3 random uppercase letters
> @@ -76,6 +78,25 @@ def store_identifiers(serial_number, uuid, backup_url):
>  class RegisterError(Exception):
>     pass
>
> +
> +class TimeoutHTTP(httplib.HTTP):
> +
> +    def __init__(self, host='', port=None, strict=None, timeout=None):
> +        if port == 0:
> +            port = None
> +        # FIXME: Depending on undocumented internals that can break between
> +        # Python releases.

Could you please add a link to a ticket in trac about this?

Thanks,

Tomeu

> +        self._setup(self._connection_class(host,
> +                 port, strict, timeout=REGISTER_TIMEOUT))
> +
> +
> +class TimeoutTransport(xmlrpclib.Transport):
> +
> +    def make_connection(self, host):
> +        host, extra_headers, x509 = self.get_host_info(host)
> +        return TimeoutHTTP(host, timeout=REGISTER_TIMEOUT)
> +
> +
>  def register_laptop(url=REGISTER_URL):
>
>     profile = get_profile()
> @@ -96,10 +117,10 @@ def register_laptop(url=REGISTER_URL):
>
>     nick = client.get_string('/desktop/sugar/user/nick')
>
> -    server = ServerProxy(url)
> +    server = xmlrpclib.ServerProxy(url, TimeoutTransport())
>     try:
>         data = server.register(sn, nick, uuid_, profile.pubkey)
> -    except (Error, TypeError, socket.error):
> +    except (xmlrpclib.Error, TypeError, socket.error):
>         logging.exception('Registration: cannot connect to server')
>         raise RegisterError(_('Cannot connect to the server.'))
>
> --
> 1.7.0.4
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>