ensure that DB connections are always closed at thread/process exit

1 files changed, 6 insertions, 3 deletions

diff --git a/src/lib/Bcfg2/Reporting/Collector.py b/src/lib/Bcfg2/Reporting/Collector.py
index 52700f917..0493c907b 100644
--- a/src/lib/Bcfg2/Reporting/Collector.py
+++ b/src/lib/Bcfg2/Reporting/Collector.py
@@ -56,7 +56,7 @@ class ReportingCollector(object):
     """The collecting process for reports"""
 
     def __init__(self, setup):
-        """Setup the collector.  This may be called by the daemon or though 
+        """Setup the collector.  This may be called by the daemon or though
         bcfg2-admin"""
         self.setup = setup
         self.datastore = setup['repo']
@@ -99,12 +99,12 @@ class ReportingCollector(object):
             raise ReportingError
 
         try:
-            self.logger.debug("Validating storage %s" % 
+            self.logger.debug("Validating storage %s" %
                 self.storage.__class__.__name__)
             self.storage.validate()
         except:
             self.logger.error("Storage backed %s failed to validate: %s" %
-                (self.storage.__class__.__name__, 
+                (self.storage.__class__.__name__,
                     traceback.format_exc().splitlines()[-1]))
 
     def run(self):
@@ -162,6 +162,9 @@ class ReportingCollector(object):
                 pass
         if self.storage:
             self.storage.shutdown()
+        from django import db
+        self.logger.info("%s: Closing database connection" % self.name)
+        db.close_connection()
 
     def reap_children(self):
         """Join any non-live threads"""