From a2cf4863eca617bcd57008730e13ab8af95e7cfa Mon Sep 17 00:00:00 2001 From: Dipankar Patro Date: Mon, 6 Sep 2010 21:42:51 +0530 Subject: [PATCH] Register widget click event reflects a timeout on unavailability of servers [Ticket #2289] The register widget when clicked, used to cause sugar to freeze. Added a timeout facilitated ServerProxy() so that connection to schoolserver is dropped in case it is not available. --- src/jarabe/desktop/schoolserver.py | 28 ++++++++++++++++++++++++++-- 1 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/jarabe/desktop/schoolserver.py b/src/jarabe/desktop/schoolserver.py index 62519df..e60e26f 100644 --- a/src/jarabe/desktop/schoolserver.py +++ b/src/jarabe/desktop/schoolserver.py @@ -16,7 +16,8 @@ import logging from gettext import gettext as _ -from xmlrpclib import ServerProxy, Error +import httplib +import xmlrpclib import socket import os import string @@ -76,6 +77,29 @@ 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=socket._GLOBAL_DEFAULT_TIMEOUT): + if port == 0: + port = None + self._setup(self._connection_class(host, port, strict, timeout)) + +class TimeoutTransport(xmlrpclib.Transport): + def __init__(self, timeout=socket._GLOBAL_DEFAULT_TIMEOUT, *args, **kwargs): + xmlrpclib.Transport.__init__(self, *args, **kwargs) + self.timeout = timeout + + def make_connection(self, host): + host, extra_headers, x509 = self.get_host_info(host) + return TimeoutHTTP(host, timeout=self.timeout) + +class TimeoutServerProxy(xmlrpclib.ServerProxy): + """ Creates a server proxy with Timeout facility. + Timeout sent in argument can be used to drop connection + for unavailable servers """ + def __init__(self, url, timeout, *args, **kwargs): + kwargs['transport'] = TimeoutTransport(timeout=timeout, use_datetime=kwargs.get('use_datetime', 0)) + xmlrpclib.ServerProxy.__init__(self, url, *args, **kwargs) + def register_laptop(url=REGISTER_URL): profile = get_profile() @@ -95,7 +119,7 @@ def register_laptop(url=REGISTER_URL): nick = client.get_string('/desktop/sugar/user/nick') - server = ServerProxy(url) + server = TimeoutServerProxy(url,10) try: data = server.register(sn, nick, uuid_, profile.pubkey) except (Error, socket.error): -- 1.7.0.4