diff options
author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-30 10:02:38 -0400 |
---|---|---|
committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-10-30 12:54:24 -0400 |
commit | a8de10cde0b83743e8e453c8318cd1ab15e7c419 (patch) | |
tree | ef1749c586f5c6521de28ffe7a8674f045f2fc7a /src/lib/Bcfg2/Reporting/Storage/DjangoORM.py | |
parent | 1c5c4f285293142e38ff54797e1c4b5a820e9cb0 (diff) | |
download | bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.gz bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.tar.bz2 bcfg2-a8de10cde0b83743e8e453c8318cd1ab15e7c419.zip |
DB: fixed how Django settings are loaded
Diffstat (limited to 'src/lib/Bcfg2/Reporting/Storage/DjangoORM.py')
-rw-r--r-- | src/lib/Bcfg2/Reporting/Storage/DjangoORM.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py index 69da9c571..f6f46ee12 100644 --- a/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py +++ b/src/lib/Bcfg2/Reporting/Storage/DjangoORM.py @@ -2,16 +2,11 @@ The base for the original DjangoORM (DBStats) """ -import os -import traceback from lxml import etree from datetime import datetime from time import strptime - -os.environ['DJANGO_SETTINGS_MODULE'] = 'Bcfg2.settings' -from Bcfg2 import settings - import Bcfg2.Options +import Bcfg2.DBSettings from Bcfg2.Compat import md5 from Bcfg2.Reporting.Storage.base import StorageBase, StorageError from Bcfg2.Server.Plugin.exceptions import PluginExecutionError @@ -377,9 +372,6 @@ class DjangoORM(StorageBase): def validate(self): """Validate backend storage. Should be called once when loaded""" - - settings.read_config() - # verify our database schema try: if Bcfg2.Options.setup.debug: @@ -392,9 +384,9 @@ class DjangoORM(StorageBase): management.call_command("migrate", verbosity=vrb, interactive=False) except: - self.logger.error("Failed to update database schema: %s" % - sys.exc_info()[1]) - raise StorageError + msg = "Failed to update database schema: %s" % sys.exc_info()[1] + self.logger.error(msg) + raise StorageError(msg) def GetExtra(self, client): """Fetch extra entries for a client""" |