diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2015-02-18 08:47:30 -0600 |
| commit | db4a3b0426f4912639c142366ff27594d54ce360 (patch) | |
| tree | fe258d4b663b9607230e456cfa25cdfe29cb3a70 /src/lib/Bcfg2/Server/Plugins/Reporting.py | |
| parent | ed9920711a6020fa01d564db34e0ee4800718cc6 (diff) | |
| parent | 89e7afbf74ffbbb54dd892bf2c4245aedee2a832 (diff) | |
| download | bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.gz bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.tar.bz2 bcfg2-db4a3b0426f4912639c142366ff27594d54ce360.zip | |
Merge pull request #250 from stpierre/blanket-except-plugins-lint
Remove blanket excepts from plugins and lint
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() |