summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2006-08-21 21:01:21 +0000
committerNarayan Desai <desai@mcs.anl.gov>2006-08-21 21:01:21 +0000
commitcd918348e4fca6589efd30975d389f4b1eab0914 (patch)
tree50af3d68b9cd03e9f54aaeb67637d88747f289da /src
parent54e54984a2a87087e1cabf5a289a245340017246 (diff)
downloadbcfg2-cd918348e4fca6589efd30975d389f4b1eab0914.tar.gz
bcfg2-cd918348e4fca6589efd30975d389f4b1eab0914.tar.bz2
bcfg2-cd918348e4fca6589efd30975d389f4b1eab0914.zip
Fix probe data receipt to use metadata
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@2080 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rwxr-xr-xsrc/sbin/bcfg2-server8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/sbin/bcfg2-server b/src/sbin/bcfg2-server
index 932e8cfab..d9d68d958 100755
--- a/src/sbin/bcfg2-server
+++ b/src/sbin/bcfg2-server
@@ -143,7 +143,13 @@ class Bcfg2Serv(Bcfg2.Server.Component.Component):
def Bcfg2RecvProbeData(self, address, probedata):
'''Receive probe data from clients'''
- client = self.resolve_client(address[0])
+ try:
+ client = self.resolve_client(address[0])
+ meta = self.Core.metadata.get_metadata(client)
+ except Bcfg2.Server.metadata.MetadataConsistencyError:
+ warning = 'metadata consistency error'
+ self.logger.warning(warning)
+ raise Fault, (6, warning)
try:
xpdata = XML(probedata)
except: