From 0304e24b8011b96d5d9d3efad16d45f10a4c7709 Mon Sep 17 00:00:00 2001 From: Alexander Sulfrian Date: Tue, 22 Sep 2015 23:51:28 +0200 Subject: Server: Use close_db_connection decorator everywhere --- src/lib/Bcfg2/Server/Core.py | 5 +---- 1 file changed, 1 insertion(+), 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): -- cgit v1.2.3-1-g7c22