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/Plugin/interfaces.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/Plugin/interfaces.py')
-rw-r--r-- | src/lib/Bcfg2/Server/Plugin/interfaces.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py index c45d6fa84..da39ac77a 100644 --- a/src/lib/Bcfg2/Server/Plugin/interfaces.py +++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py @@ -445,8 +445,14 @@ class ThreadedStatistics(Statistics, Threaded, threading.Thread): except Empty: continue except: - err = sys.exc_info()[1] - self.logger.error("ThreadedStatistics: %s" % err) + # we want to catch all exceptions here so that a stray + # error doesn't kill the entire statistics thread. For + # instance, if a bad value gets pushed onto the queue + # and the assignment above raises TypeError, we want + # to report the error, ignore the bad value, and + # continue processing statistics. + self.logger.error("Unknown error processing statistics: %s" % + sys.exc_info()[1]) continue self.handle_statistic(client, xdata) if self.work_queue is not None and not self.work_queue.empty(): |