diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-06-15 15:04:04 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2011-06-15 15:04:04 -0400 |
| commit | dfee52f047c4d50b9b7120b4310c11397d1a0620 (patch) | |
| tree | 6df5e9dc89395a3fe14fb2e4e678b3b712d457af | |
| parent | bf5541fb963bfa01e0d9bdf03e80cf2d2a77bfd5 (diff) | |
| download | bcfg2-dfee52f047c4d50b9b7120b4310c11397d1a0620.tar.gz bcfg2-dfee52f047c4d50b9b7120b4310c11397d1a0620.tar.bz2 bcfg2-dfee52f047c4d50b9b7120b4310c11397d1a0620.zip | |
cleaned up some ProbeData stuff, make null probe storage more consistent
| -rw-r--r-- | src/lib/Server/Plugins/Probes.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Probes.py b/src/lib/Server/Plugins/Probes.py index 4a7171297..b07c4dfd3 100644 --- a/src/lib/Server/Plugins/Probes.py +++ b/src/lib/Server/Plugins/Probes.py @@ -165,7 +165,7 @@ class Probes(Bcfg2.Server.Plugin.Plugin, cx = lxml.etree.SubElement(top, 'Client', name=client) for probe in sorted(probed): lxml.etree.SubElement(cx, 'Probe', name=probe, - value=self.probedata[client][probe]) + value=str(self.probedata[client][probe])) for group in sorted(self.cgroups[client]): lxml.etree.SubElement(cx, "Group", name=group) data = lxml.etree.tostring(top, encoding='UTF-8', @@ -214,9 +214,11 @@ class Probes(Bcfg2.Server.Plugin.Plugin, self.logger.error("Got null response to probe %s from %s" % \ (data.get('name'), client.hostname)) try: - self.probedata[client.hostname].update({data.get('name'): ''}) + self.probedata[client.hostname].update({data.get('name'): + ProbeData('')}) except KeyError: - self.probedata[client.hostname] = {data.get('name'): ''} + self.probedata[client.hostname] = \ + {data.get('name'): ProbeData('')} return dlines = data.text.split('\n') self.logger.debug("%s:probe:%s:%s" % (client.hostname, |