summaryrefslogtreecommitdiffstats
path: root/src/sbin
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-11-26 15:57:56 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-11-26 15:57:56 +0000
commit46cb96e0eb6122d50bb37fc25ac63dc6f0d30d82 (patch)
treef6ad3086232142e9f2859b870970e263b520ba68 /src/sbin
parent1e7086f009aeea0b749fa3ff24946438298f5943 (diff)
downloadbcfg2-46cb96e0eb6122d50bb37fc25ac63dc6f0d30d82.tar.gz
bcfg2-46cb96e0eb6122d50bb37fc25ac63dc6f0d30d82.tar.bz2
bcfg2-46cb96e0eb6122d50bb37fc25ac63dc6f0d30d82.zip
Improve probe download failure message (Resolves Ticket #297)
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2541 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/sbin')
-rwxr-xr-xsrc/sbin/bcfg23
-rwxr-xr-xsrc/sbin/bcfg2-server2
2 files changed, 3 insertions, 2 deletions
diff --git a/src/sbin/bcfg2 b/src/sbin/bcfg2
index 5f2094453..6920e0a9b 100755
--- a/src/sbin/bcfg2
+++ b/src/sbin/bcfg2
@@ -139,8 +139,9 @@ class Client:
try:
probe_data = proxy.GetProbes()
- except xmlrpclib.Fault:
+ except xmlrpclib.Fault, flt:
self.logger.error("Failed to download probes from bcfg2")
+ self.logger.error(flt.faultString)
raise SystemExit, 1
times['probe_download'] = time.time()
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 4204b49ba..0546d869f 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -127,7 +127,7 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
resp.append(probe)
return tostring(resp)
except Bcfg2.Server.Plugins.Metadata.MetadataConsistencyError:
- warning = 'metadata consistency error'
+ warning = 'Client metadata resolution error for %s' % address[0]
self.logger.warning(warning)
raise Fault, (6, warning)
except: