From 3ba7ad8d4dd5049273f5005b665ebcac0f410ddc Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Mon, 27 Oct 2014 15:35:39 +0100 Subject: Reporting/Collector: fix python2.4 compatibility --- src/lib/Bcfg2/Reporting/Collector.py | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) (limited to 'src') 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', ''), - 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', + ''), + 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() -- cgit v1.2.3-1-g7c22