diff options
| author | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-28 21:12:22 +0100 |
|---|---|---|
| committer | Alexander Sulfrian <alexander.sulfrian@fu-berlin.de> | 2016-11-28 21:17:54 +0100 |
| commit | fa0d86aba32c40d829f9f94411403221a48283e8 (patch) | |
| tree | 907460195745cc57287ffa2c23621a99c8a68eed /src/lib/Bcfg2/DBSettings.py | |
| parent | 73fb40f2ac080ccbb4d9f0f0acc2c7f5009321f6 (diff) | |
| download | bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.tar.gz bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.tar.bz2 bcfg2-fa0d86aba32c40d829f9f94411403221a48283e8.zip | |
DBSettings: Call django.setup() right after configuring the settings
If required the DBSettings config hook will call django.setup right after
configuring django with the required settings. So we can drop the calls to
django.setup from all other places.
Diffstat (limited to 'src/lib/Bcfg2/DBSettings.py')
| -rw-r--r-- | src/lib/Bcfg2/DBSettings.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/lib/Bcfg2/DBSettings.py b/src/lib/Bcfg2/DBSettings.py index 6409f8b37..254dfa4b8 100644 --- a/src/lib/Bcfg2/DBSettings.py +++ b/src/lib/Bcfg2/DBSettings.py @@ -143,6 +143,8 @@ def finalize_django_config(opts=None, silent=False): setattr(module, name, value) try: django.conf.settings.configure(**settings) + if django.VERSION[0] == 1 and django.VERSION[1] >= 7: + django.setup() # pylint: disable=E1101 except RuntimeError: if not silent: logger.warning("Failed to finalize Django settings: %s" % @@ -204,7 +206,6 @@ def migrate_databases(**kwargs): for database in settings['DATABASES']: logger.debug("Migrating database %s" % (database)) if django.VERSION[0] == 1 and django.VERSION[1] >= 7: - django.setup() # pylint: disable=E1101 if initial_django_migration(database): logger.warning( "No applied django migrations found for database %s. " |