diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-27 15:35:39 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2014-10-27 15:35:39 +0100 |
| commit | 3ba7ad8d4dd5049273f5005b665ebcac0f410ddc (patch) | |
| tree | c5af48c5e2afa2a1c9fb0a16181888a8088eb7cf | |
| parent | 2c87c4e4de08c0070ebc5c095c03fc3b233f92d1 (diff) | |
| download | bcfg2-3ba7ad8d4dd5049273f5005b665ebcac0f410ddc.tar.gz bcfg2-3ba7ad8d4dd5049273f5005b665ebcac0f410ddc.tar.bz2 bcfg2-3ba7ad8d4dd5049273f5005b665ebcac0f410ddc.zip | |
Reporting/Collector: fix python2.4 compatibility
| -rw-r--r-- | src/lib/Bcfg2/Reporting/Collector.py | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py index b6c35fdd0..88e8f68eb 100644 --- a/src/lib/Bcfg2/Reporting/Collector.py +++ b/src/lib/Bcfg2/Reporting/Collector.py @@ -43,15 +43,17 @@ class ReportingStoreThread(threading.Thread): def run(self): """Call the database storage procedure (aka import)""" try: - start = time.time() - self.storage.import_interaction(self.interaction) - self.logger.info("Imported interaction for %s in %ss" % - (self.interaction.get('hostname', '<unknown>'), - time.time() - start)) - except: - #TODO requeue? - self.logger.error("Unhandled exception in import thread %s" % - sys.exc_info()[1]) + try: + start = time.time() + self.storage.import_interaction(self.interaction) + self.logger.info("Imported interaction for %s in %ss" % + (self.interaction.get('hostname', + '<unknown>'), + time.time() - start)) + except: + #TODO requeue? + self.logger.error("Unhandled exception in import thread %s" % + sys.exc_info()[1]) finally: if self.semaphore: self.semaphore.release() |