summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2009-12-23 19:57:38 +0000
committerNarayan Desai <desai@mcs.anl.gov>2009-12-23 19:57:38 +0000
commit9f8578f99ccc3d2944ef5d3d8a1385d351743f59 (patch)
treea5df7289b6df38c363255c48239c04848e1b84e3 /src
parentb60cbe84484c5c71e7d3ebe9b4a47154e227d95f (diff)
downloadbcfg2-9f8578f99ccc3d2944ef5d3d8a1385d351743f59.tar.gz
bcfg2-9f8578f99ccc3d2944ef5d3d8a1385d351743f59.tar.bz2
bcfg2-9f8578f99ccc3d2944ef5d3d8a1385d351743f59.zip
Core: Uniformly handle Metadata resolution errors
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@5631 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src')
-rw-r--r--src/lib/Server/Core.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index 7aa859143..efb6f10a3 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -318,6 +318,10 @@ class Core(Component):
warning = 'Client metadata resolution error for %s; check server log' % address[0]
self.logger.warning(warning)
raise xmlrpclib.Fault(6, warning)
+ except Bcfg2.Server.Plugins.Metadata.MetadataRuntimeError:
+ err_msg = 'metadata system runtime failure'
+ self.logger.error(err_msg)
+ raise xmlrpclib.Fault(6, err_msg)
except:
critical_error("error determining client probes")