diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2014-12-09 11:10:24 -0600 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:24:24 -0600 |
commit | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (patch) | |
tree | ed4623b5c6e39d80c132e9f21f3d4804cabd93be /src/lib/Bcfg2/Server/Plugins/Reporting.py | |
parent | 64b458b380620f84843b1841b441745a0984946f (diff) | |
download | bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.gz bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.tar.bz2 bcfg2-89e7afbf74ffbbb54dd892bf2c4245aedee2a832.zip |
Remove blanket excepts from plugins and lint
This removes most blanket except: clauses from all plugins, including
the base plugin libraries, and bcfg2-lint. The few that remain should
all be necessary.
Most of the changes were quite minor, but this did require some
restructuring of the CfgPrivateKeyCreator; as a result, the tests for
that module were rewritten.
Diffstat (limited to 'src/lib/Bcfg2/Server/Plugins/Reporting.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugins/Reporting.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/lib/Bcfg2/Server/Plugins/Reporting.py b/src/lib/Bcfg2/Server/Plugins/Reporting.py index 282de8247..5c73546b4 100644 --- a/src/lib/Bcfg2/Server/Plugins/Reporting.py +++ b/src/lib/Bcfg2/Server/Plugins/Reporting.py @@ -3,7 +3,6 @@ import sys import time import platform -import traceback import lxml.etree import Bcfg2.Options from Bcfg2.Reporting.Transport.base import TransportError @@ -102,11 +101,11 @@ class Reporting(Statistics, Threaded, PullSource): except TransportError: continue except: - self.logger.error("%s: Attempt %s: Failed to add statistic %s" + self.logger.error("%s: Attempt %s: Failed to add statistic: %s" % (self.__class__.__name__, i, - traceback.format_exc().splitlines()[-1])) - self.logger.error("%s: Retry limit reached for %s" % - (self.__class__.__name__, client.hostname)) + sys.exc_info()[1])) + raise PluginExecutionError("%s: Retry limit reached for %s" % + (self.__class__.__name__, client.hostname)) def shutdown(self): super(Reporting, self).shutdown() |