diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-09 10:07:41 -0400 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2012-10-09 10:07:41 -0400 |
| commit | caef853dbe368a6473fa1a66610982daaaa51ce5 (patch) | |
| tree | 509d7d073d4eb21a90a90707d56ded5c83d3e79b /src | |
| parent | d7a6c05ed76c1a3950fa320e827b22e6e517986c (diff) | |
| download | bcfg2-caef853dbe368a6473fa1a66610982daaaa51ce5.tar.gz bcfg2-caef853dbe368a6473fa1a66610982daaaa51ce5.tar.bz2 bcfg2-caef853dbe368a6473fa1a66610982daaaa51ce5.zip | |
ThreadedStatistics: removed unused error catching
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/Bcfg2/Server/Plugin/interfaces.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/lib/Bcfg2/Server/Plugin/interfaces.py b/src/lib/Bcfg2/Server/Plugin/interfaces.py index f87f6b039..894165858 100644 --- a/src/lib/Bcfg2/Server/Plugin/interfaces.py +++ b/src/lib/Bcfg2/Server/Plugin/interfaces.py @@ -320,16 +320,11 @@ class ThreadedStatistics(Statistics, threading.Thread): try: while not self.work_queue.empty(): (metadata, data) = self.work_queue.get_nowait() - try: - pending_data.append( - (metadata.hostname, - lxml.etree.tostring( - data, - xml_declaration=False).decode("UTF-8"))) - except Full: - err = sys.exc_info()[1] - self.logger.warning("Dropping interaction for %s: %s" % - (metadata.hostname, err)) + pending_data.append( + (metadata.hostname, + lxml.etree.tostring( + data, + xml_declaration=False).decode("UTF-8"))) except Empty: pass @@ -401,7 +396,7 @@ class ThreadedStatistics(Statistics, threading.Thread): (client, xdata) = self.work_queue.get(block=True, timeout=2) except Empty: continue - except Exception: + except: err = sys.exc_info()[1] self.logger.error("ThreadedStatistics: %s" % err) continue |