set keyword attributes on most files

added Ed's client and server cleanups
Modified the debian and redhat toolsets to produce nicer output
 ** Broke performance reports


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

1 files changed, 10 insertions, 6 deletions

diff --git a/src/sbin/Bcfg2Server b/src/sbin/Bcfg2Server
index 4b4193b76..8477fd4ca 100644
--- a/src/sbin/Bcfg2Server
+++ b/src/sbin/Bcfg2Server
@@ -24,9 +24,9 @@ def critical_error(operation):
     (ttype, value, trace) = exc_info()
     for line in extract_tb(trace):        
         syslog(LOG_ERR, "File %s, line %i, in %s\n   %s" % (line))
-        syslog(LOG_ERR, "%s: %s" % (ttype, value))
-    del trace, val, trb
+    syslog(LOG_ERR, "%s: %s" % (ttype, value))
     warning_error("An unexpected failure occurred in %s" % (operation) )
+    raise Fault, (7, "Critical unexpected failure: %s" % (operation))
 
 def fatal_error(message):
     '''Signal a fatal error'''
@@ -166,14 +166,18 @@ class Bcfg2(Component):
 
         try:
             meta = self.Core.metadata.FetchMetadata(client)
+            
+            for generator in self.Core.generators:
+                for probe in generator.GetProbes(meta):
+                    resp.append(probe)
+            return tostring(resp)
         except MetadataConsistencyError:
             warning = 'metadata consistency error'
             warning_error(warning)
             raise Fault, (6, warning)
-        for generator in self.Core.generators:
-            for probe in generator.GetProbes(meta):
-                resp.append(probe)
-        return tostring(resp)
+        except:
+            critical_error("determining client probes")
+
 
     def Bcfg2RecvProbeData(self, address, probedata):
         '''Receive probe data from clients'''