diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-01-31 17:11:58 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-01-31 17:11:58 +0000 |
| commit | 965bb8ca00805997c0dea18d8c87fd5813c1ebce (patch) | |
| tree | e00188a4f59dcd065631d21dcff48aa7f0ffb427 /src | |
| parent | 1a0f4f60fac591b2f02b5899a9ca5a7735b36198 (diff) | |
| download | bcfg2-965bb8ca00805997c0dea18d8c87fd5813c1ebce.tar.gz bcfg2-965bb8ca00805997c0dea18d8c87fd5813c1ebce.tar.bz2 bcfg2-965bb8ca00805997c0dea18d8c87fd5813c1ebce.zip | |
minor bugfixes
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@1722 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Component.py | 5 | ||||
| -rw-r--r-- | src/lib/Server/Plugin.py | 5 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Server/Component.py b/src/lib/Server/Component.py index 01b4e1b0a..de41a2277 100644 --- a/src/lib/Server/Component.py +++ b/src/lib/Server/Component.py @@ -90,7 +90,10 @@ class Component(SSL.SSLServer, self.logRequests = 0 # setup unhandled request syslog handling SimpleXMLRPCServer.SimpleXMLRPCDispatcher.__init__(self) - SSL.SSLServer.__init__(self, location, CobaltXMLRPCRequestHandler, sslctx) + try: + SSL.SSLServer.__init__(self, location, CobaltXMLRPCRequestHandler, sslctx) + except socket.error, serr: + self.logger.error("Failed to bind to location %s" % (location,), exc_info=1) self.port = self.socket.socket.getsockname()[1] self.logger.info("Bound to port %s" % self.port) self.funcs.update({'HandleEvents':self.HandleEvents, diff --git a/src/lib/Server/Plugin.py b/src/lib/Server/Plugin.py index be4d7ba23..fb3775034 100644 --- a/src/lib/Server/Plugin.py +++ b/src/lib/Server/Plugin.py @@ -241,7 +241,10 @@ class XMLSrc(XMLFileBacked): def Index(self): self.names = [] - xdata = XML(self.data) + try: + xdata = lxml.etree.XML(self.data) + except lxml.etree.XMLSyntaxError: + logger.error("Failed to parse file %s" % ( self.name)) self.pnode = self.__node__(xdata, self.names) self.cache = None self.priority = xdata.attrib['priority'] |