summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-01-31 17:11:58 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-01-31 17:11:58 +0000
commit965bb8ca00805997c0dea18d8c87fd5813c1ebce (patch)
treee00188a4f59dcd065631d21dcff48aa7f0ffb427
parent1a0f4f60fac591b2f02b5899a9ca5a7735b36198 (diff)
downloadbcfg2-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
-rw-r--r--doc/reports.xml16
-rw-r--r--src/lib/Server/Component.py5
-rw-r--r--src/lib/Server/Plugin.py5
3 files changed, 20 insertions, 6 deletions
diff --git a/doc/reports.xml b/doc/reports.xml
index e02e49cf4..3913a9985 100644
--- a/doc/reports.xml
+++ b/doc/reports.xml
@@ -202,7 +202,7 @@
</para>
<example>
- <title><filename>etc/report-configuration.xml</filename></title>
+ <title>etc/report-configuration.xml</title>
<programlisting><![CDATA[<Reports>
<Report name='core_stats' good='Y' modified='Y'>
<Delivery mechanism='mail' type='nodes-digest'>
@@ -235,7 +235,15 @@
<command>StatReports</command> by hand if you would like
in order to try it out immediately.
</para>
-
-</section>
-
+
+ <mediaobject>
+ <imageobject>
+ <imagedata fileref='./images/composed.tif'/>
+ </imageobject>
+
+ <caption>
+ <para>Examples of the performance and overview reports.</para>
+ </caption>
+ </mediaobject>
+ </section>
</chapter> \ No newline at end of file
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']