From 5b3ffd488a8b5f727a531a3b7c3ca419bb53d04e Mon Sep 17 00:00:00 2001 From: Tim Laszlo Date: Tue, 7 Aug 2012 13:37:33 -0500 Subject: Merge reporting configuration with main server configuration Admin/Syncdb: Use SchemaUpdater Move the schema update routines from reports to Bcfg2.Server Move Reports.settings into Bcfg2.settings --- src/lib/Bcfg2/Server/Core.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'src/lib/Bcfg2/Server/Core.py') diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 34e0d4889..7e0e33024 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -105,6 +105,23 @@ class BaseCore(object): # load plugins Bcfg2.settings.read_config(cfile=self.cfile, repo=self.datastore) + # verify our database schema + try: + from Bcfg2.Server.SchemaUpdater import update_database, UpdaterError + update_database() + except ImportError: + # assume django is not installed + pass + except UpdaterError: + self.logger.error("Failed to update database schema") + raise CoreInitError + except Exception: + inst = sys.exc_info()[1] + self.logger.error("Failed to update database schema") + self.logger.error(str(inst)) + self.logger.error(str(type(inst))) + raise CoreInitError + if '' in setup['plugins']: setup['plugins'].remove('') -- cgit v1.2.3-1-g7c22