diff options
| author | Narayan Desai <desai@mcs.anl.gov> | 2006-12-12 17:00:53 +0000 |
|---|---|---|
| committer | Narayan Desai <desai@mcs.anl.gov> | 2006-12-12 17:00:53 +0000 |
| commit | 44550e33cca1698d2284be11989dfdd10c7a1777 (patch) | |
| tree | 0eb23542c4bc85fe2c27095d00fd9e5ad72e81ca /src | |
| parent | a6b556807a0012aaadbeb5a58ee9482d33f782d6 (diff) | |
| download | bcfg2-44550e33cca1698d2284be11989dfdd10c7a1777.tar.gz bcfg2-44550e33cca1698d2284be11989dfdd10c7a1777.tar.bz2 bcfg2-44550e33cca1698d2284be11989dfdd10c7a1777.zip | |
Fix probes for _all_ plugins
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2590 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Server/Plugins/Metadata.py | 3 | ||||
| -rwxr-xr-x | src/sbin/bcfg2-server | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/lib/Server/Plugins/Metadata.py b/src/lib/Server/Plugins/Metadata.py index 3d9854dd3..1f442feed 100644 --- a/src/lib/Server/Plugins/Metadata.py +++ b/src/lib/Server/Plugins/Metadata.py @@ -209,7 +209,8 @@ class Metadata(Bcfg2.Server.Plugin.Plugin): ret = [] if self.probes: bangline = re.compile('^#!(?P<interpreter>(/\w+)+)$') - for name, entry in [x for x in self.probes.entries.iteritems() if x.data]: + for name, entry in [(name, entry) for name, entry in \ + self.probes.entries.iteritems() if entry.data]: probe = lxml.etree.Element('probe') probe.set('name', name ) probe.set('source', self.__name__) diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server index 0f67ccff1..eecb0e11d 100755 --- a/src/sbin/bcfg2-server +++ b/src/sbin/bcfg2-server @@ -131,8 +131,8 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component): name = self.Core.metadata.resolve_client(address[0]) meta = self.Core.metadata.get_metadata(name) - for generator in self.Core.generators: - for probe in generator.GetProbes(meta): + for plugin in self.Core.plugins.values(): + for probe in plugin.GetProbes(meta): resp.append(probe) return tostring(resp) except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError: |