summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-22 23:51:28 +0200
committerAlexander Sulfrian <alexander.sulfrian@fu-berlin.de>2015-09-23 19:29:01 +0200
commit0304e24b8011b96d5d9d3efad16d45f10a4c7709 (patch)
tree09321afa7a106b28b059158c81117c95927e60dd
parentb5a966bdf8bed555e7c79b2cb77c14463aade22d (diff)
downloadbcfg2-0304e24b8011b96d5d9d3efad16d45f10a4c7709.tar.gz
bcfg2-0304e24b8011b96d5d9d3efad16d45f10a4c7709.tar.bz2
bcfg2-0304e24b8011b96d5d9d3efad16d45f10a4c7709.zip
Server: Use close_db_connection decorator everywhere
-rw-r--r--src/lib/Bcfg2/Server/Core.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py
index dc9c91556..4592688e7 100644
--- a/src/lib/Bcfg2/Server/Core.py
+++ b/src/lib/Bcfg2/Server/Core.py
@@ -430,6 +430,7 @@ class Core(object):
self.logger.error("Unexpected instantiation failure for plugin %s"
% plugin, exc_info=1)
+ @close_db_connection
def shutdown(self):
""" Perform plugin and FAM shutdown tasks. """
if not self._running:
@@ -444,10 +445,6 @@ class Core(object):
for plugin in list(self.plugins.values()):
plugin.shutdown()
self.logger.info("%s: All plugins shut down" % self.name)
- if self._database_available:
- from django import db
- self.logger.info("%s: Closing database connection" % self.name)
- db.close_connection()
@property
def metadata_cache_mode(self):