Clean up stable probe data and dynamic groups properly (Reported by SolJ)

git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@4437 ce84e21b-d406-0410-9b95-82705330c041

1 files changed, 12 insertions, 8 deletions

diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index cb27e9c89..09d2ce619 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -128,14 +128,18 @@ class Bcfg2Serv(Bcfg2.Component.Component):
             self.logger.error("Failed to parse probe data from client %s" % (address[0]))
             return False
 
-        for data in xpdata:
-            if self.Core.plugins.has_key(data.get('source')):
-                try:
-                    self.Core.plugins[data.get('source')].ReceiveData(meta, data)
-                except:
-                    self.logger.error("Failed to process probe data from client %s" % (address[0]), exc_info=1)
-            else:
-                self.logger.warning("Failed to locate plugin %s" % (data.get('source')))
+        sources = []
+        [sources.append(data.get('source')) for data in xpdata
+         if data.get('source') not in sources]
+        for source in sources:
+            if source not in self.Core.plugins:
+                self.logger.warning("Failed to locate plugin %s" % (source))
+                continue
+            dl = [data for data in xpdata if data.get('source') == source]
+            try:
+                self.Core.plugins[source].ReceiveData(meta, dl)
+            except:
+                self.logger.error("Failed to process probe data from client %s" % (address[0]), exc_info=1)
         return True
 
     def Bcfg2AssertProfile(self, address, profile):