aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>2006-03-23 11:40:43 +0100
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>2006-03-23 11:40:43 +0100
commit9fffa2e25eb15a180c82db6cf199de7fae713c29 (patch)
tree07f77780a13da698ef1fe9a00670b8a8bfbf4e4b
parentf9617f82098d6f00edc474b75eb80363dbf9c42c (diff)
downloadxen-9fffa2e25eb15a180c82db6cf199de7fae713c29.tar.gz
xen-9fffa2e25eb15a180c82db6cf199de7fae713c29.tar.bz2
xen-9fffa2e25eb15a180c82db6cf199de7fae713c29.zip
Removed unused handler parameter from UnixXMLRPCServer interface -- just pass
UnixXMLRPCRequestHandler through to TCPXMLRPCServer. Do not log requests -- this fills up xend-debug.log uselessly. Signed-off-by: Ewan Mellor <ewan@xensource.com>
-rw-r--r--tools/python/xen/util/xmlrpclib2.py6
-rw-r--r--tools/python/xen/xend/server/XMLRPCServer.py5
2 files changed, 6 insertions, 5 deletions
diff --git a/tools/python/xen/util/xmlrpclib2.py b/tools/python/xen/util/xmlrpclib2.py
index 8504b41439..794a003b5d 100644
--- a/tools/python/xen/util/xmlrpclib2.py
+++ b/tools/python/xen/util/xmlrpclib2.py
@@ -99,11 +99,11 @@ class UnixXMLRPCRequestHandler(SimpleXMLRPCRequestHandler):
class UnixXMLRPCServer(TCPXMLRPCServer):
address_family = socket.AF_UNIX
- def __init__(self, addr, requestHandler=UnixXMLRPCRequestHandler,
- logRequests=1):
+ def __init__(self, addr, logRequests):
if self.allow_reuse_address:
try:
os.unlink(addr)
except OSError, exc:
pass
- TCPXMLRPCServer.__init__(self, addr, requestHandler, logRequests)
+ TCPXMLRPCServer.__init__(self, addr, UnixXMLRPCRequestHandler,
+ logRequests)
diff --git a/tools/python/xen/xend/server/XMLRPCServer.py b/tools/python/xen/xend/server/XMLRPCServer.py
index 4fec44a8f1..8c3890fe62 100644
--- a/tools/python/xen/xend/server/XMLRPCServer.py
+++ b/tools/python/xen/xend/server/XMLRPCServer.py
@@ -13,6 +13,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#============================================================================
# Copyright (C) 2006 Anthony Liguori <aliguori@us.ibm.com>
+# Copyright (C) 2006 XenSource Ltd
#============================================================================
from xen.xend import XendDomain, XendDomainInfo, XendNode, \
@@ -69,9 +70,9 @@ class XMLRPCServer:
if self.use_tcp:
# bind to something fixed for now as we may eliminate
# tcp support completely.
- self.server = TCPXMLRPCServer(("localhost", 8005))
+ self.server = TCPXMLRPCServer(("localhost", 8005, False))
else:
- self.server = UnixXMLRPCServer(XML_RPC_SOCKET)
+ self.server = UnixXMLRPCServer(XML_RPC_SOCKET, False)
# Functions in XendDomainInfo
for name in methods: