From 07f8f4943d0e6d1b45e76498021f6b5ff8ed63dc Mon Sep 17 00:00:00 2001 From: Stephane Wirtel Date: Tue, 25 Nov 2008 12:43:00 +0100 Subject: [PATCH] [FIX] Use the logger for the message 'Address already in use' bzr revid: stephane@tinyerp.com-20081125114300-xb0cprmc9ked3pr5 --- bin/netsvc.py | 26 +++++++++----------------- 1 file changed, 9 insertions(+), 17 deletions(-) diff --git a/bin/netsvc.py b/bin/netsvc.py index dd8a5046f74..b84f5cecb68 100644 --- a/bin/netsvc.py +++ b/bin/netsvc.py @@ -275,24 +275,19 @@ class GenericXMLRPCRequestHandler: raise xmlrpclib.Fault(s, tb_s) -class SimpleXMLRPCRequestHandler(GenericXMLRPCRequestHandler, - SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): +class SimpleXMLRPCRequestHandler(GenericXMLRPCRequestHandler, SimpleXMLRPCServer.SimpleXMLRPCRequestHandler): SimpleXMLRPCServer.SimpleXMLRPCRequestHandler.rpc_paths = get_rpc_paths() - -class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn, - SimpleXMLRPCServer.SimpleXMLRPCServer): +class SimpleThreadedXMLRPCServer(SocketServer.ThreadingMixIn, SimpleXMLRPCServer.SimpleXMLRPCServer): def server_bind(self): try: - self.socket.setsockopt(socket.SOL_SOCKET, - socket.SO_REUSEADDR, 1) + self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) SimpleXMLRPCServer.SimpleXMLRPCServer.server_bind(self) except: - sys.stderr.write("ERROR: address already in use\n") + Logger().notifyChannel('init', LOG_ERROR, 'Address already in use') sys.exit(1) - class HttpDaemon(threading.Thread): def __init__(self, interface, port, secure=False): @@ -302,22 +297,19 @@ class HttpDaemon(threading.Thread): self.secure = secure if secure: from ssl import SecureXMLRPCServer - class SecureXMLRPCRequestHandler(GenericXMLRPCRequestHandler, - SecureXMLRPCServer.SecureXMLRPCRequestHandler): - SecureXMLRPCServer.SecureXMLRPCRequestHandler.rpc_paths = get_rpc_paths() - class SecureThreadedXMLRPCServer(SocketServer.ThreadingMixIn, - SecureXMLRPCServer.SecureXMLRPCServer): + class SecureXMLRPCRequestHandler(GenericXMLRPCRequestHandler, SecureXMLRPCServer.SecureXMLRPCRequestHandler): + SecureXMLRPCServer.SecureXMLRPCRequestHandler.rpc_paths = get_rpc_paths() + + class SecureThreadedXMLRPCServer(SocketServer.ThreadingMixIn, SecureXMLRPCServer.SecureXMLRPCServer): def server_bind(self): try: - self.socket.setsockopt(socket.SOL_SOCKET, - socket.SO_REUSEADDR, 1) + self.socket.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1) SecureXMLRPCServer.SecureXMLRPCServer.server_bind(self) except: sys.stderr.write("ERROR: address already in use\n") sys.exit(1) - self.server = SecureThreadedXMLRPCServer((interface, port), SecureXMLRPCRequestHandler, 0) else: