From 66d89ff62677c20139ea1973e547eea8e117a714 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Mon, 11 May 2015 11:30:32 -0500 Subject: Bundler: Catch all exceptions in BuildStructures This fixes a regression in 89e7afbf74ffb that made an unexpected failure in a bundle (e.g., an arbitrary exception raised by a templated bundle) prevent all subsequent bundles from being built, too. Restoring the blanket 'except' makes it so that an unexpected failure only affects the specific bundle that fails. --- src/lib/Bcfg2/Server/Plugins/Bundler.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/lib/Bcfg2/Server') diff --git a/src/lib/Bcfg2/Server/Plugins/Bundler.py b/src/lib/Bcfg2/Server/Plugins/Bundler.py index e38eeea89..6c35ada59 100644 --- a/src/lib/Bcfg2/Server/Plugins/Bundler.py +++ b/src/lib/Bcfg2/Server/Plugins/Bundler.py @@ -92,6 +92,10 @@ class Bundler(Plugin, self.logger.error("Bundler: Failed to render templated bundle " "%s: %s" % (bundlename, err)) continue + except: + self.logger.error("Bundler: Unexpected bundler error for %s" % + bundlename, exc_info=1) + continue if data.get("independent", "false").lower() == "true": data.tag = "Independent" -- cgit v1.2.3-1-g7c22