diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:43:28 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-05-15 09:43:28 -0400 |
| commit | 14ff0892f13ad45c99043fd9c90b6b1b7829b268 (patch) | |
| tree | 53f795b75c7e996c277381a3da20f3a52fce1df5 /src/lib/Server/Core.py | |
| parent | dfd79c78df9351c1c4c337f94881bba878c3c549 (diff) | |
| download | bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.gz bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.tar.bz2 bcfg2-14ff0892f13ad45c99043fd9c90b6b1b7829b268.zip | |
use XML parser that strips whitespace to avoid xml concatenation pretty_print issue
Diffstat (limited to 'src/lib/Server/Core.py')
| -rw-r--r-- | src/lib/Server/Core.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py index 8f02e0a40..9fa42cfd1 100644 --- a/src/lib/Server/Core.py +++ b/src/lib/Server/Core.py @@ -17,6 +17,7 @@ except ImportError: from Bcfg2.Component import Component, exposed from Bcfg2.Server.Plugin import PluginInitError, PluginExecutionError +import Bcfg2.Server import Bcfg2.Server.FileMonitor import Bcfg2.Server.Plugins.Metadata # Compatibility imports @@ -413,7 +414,8 @@ class Core(Component): # clear dynamic groups self.metadata.cgroups[meta.hostname] = [] try: - xpdata = lxml.etree.XML(probedata.encode('utf-8')) + xpdata = lxml.etree.XML(probedata.encode('utf-8'), + parser=Bcfg2.Server.XMLParser) except: self.logger.error("Failed to parse probe data from client %s" % \ (address[0])) @@ -462,7 +464,8 @@ class Core(Component): @exposed def RecvStats(self, address, stats): """Act on statistics upload.""" - sdata = lxml.etree.XML(stats.encode('utf-8')) + sdata = lxml.etree.XML(stats.encode('utf-8'), + parser=Bcfg2.Server.XMLParser) client = self.metadata.resolve_client(address) self.process_statistics(client, sdata) return "<ok/>" |