summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/Core.py
diff options
context:
space:
mode:
authorChris St. Pierre <chris.a.st.pierre@gmail.com>2013-07-09 14:08:00 -0400
committerChris St. Pierre <chris.a.st.pierre@gmail.com>2013-07-09 14:08:00 -0400
commit217b8c75e3f5163debb56150c27440b5268e3542 (patch)
tree59dad5d8582efbce0e9e0738348ceb09464cd4fc /src/lib/Bcfg2/Server/Core.py
parentaccbb1831ae88e57baabf01a783fe7a8ee0a0ccb (diff)
downloadbcfg2-217b8c75e3f5163debb56150c27440b5268e3542.tar.gz
bcfg2-217b8c75e3f5163debb56150c27440b5268e3542.tar.bz2
bcfg2-217b8c75e3f5163debb56150c27440b5268e3542.zip
Core: Gracefully handle failure to add client without default group
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
-rw-r--r--src/lib/Bcfg2/Server/Core.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index a22531d2d..1291584b0 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -858,7 +858,12 @@ class BaseCore(object):
imd = self.metadata_cache.get(client_name, None)
if not imd:
self.logger.debug("Building metadata for %s" % client_name)
- imd = self.metadata.get_initial_metadata(client_name)
+ try:
+ imd = self.metadata.get_initial_metadata(client_name)
+ except MetadataConsistencyError:
+ self.critical_error(
+ "Client metadata resolution error for %s: %s" %
+ (client_name, sys.exc_info()[1]))
connectors = self.plugins_by_type(Connector)
for conn in connectors:
grps = conn.get_additional_groups(imd)