summaryrefslogtreecommitdiffstats
path: root/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
diff options
context:
space:
mode:
authorTim Laszlo <tim.laszlo@gmail.com>2012-08-15 12:35:26 -0500
committerTim Laszlo <tim.laszlo@gmail.com>2012-08-15 12:35:26 -0500
commitf5d3b73b36712944558f5529785b29621cb5cc11 (patch)
tree7b8efd457a1327f4b11e05cc5138b1af6b265bb6 /src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
parentaf44641c5511d35889fa4c25ffda0d2aa8eb4be6 (diff)
downloadbcfg2-f5d3b73b36712944558f5529785b29621cb5cc11.tar.gz
bcfg2-f5d3b73b36712944558f5529785b29621cb5cc11.tar.bz2
bcfg2-f5d3b73b36712944558f5529785b29621cb5cc11.zip
Core: add database_available flag to allow plugins to see availability
Diffstat (limited to 'src/lib/Bcfg2/Server/SchemaUpdater/__init__.py')
-rw-r--r--src/lib/Bcfg2/Server/SchemaUpdater/__init__.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
index ac33724a0..d57175cd7 100644
--- a/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
+++ b/src/lib/Bcfg2/Server/SchemaUpdater/__init__.py
@@ -1,4 +1,5 @@
from django.db import connection, DatabaseError
+from django.core.exceptions import ImproperlyConfigured
import django.core.management
import logging
import pkgutil
@@ -232,6 +233,9 @@ def update_database():
except UpdaterError:
raise
+ except ImproperlyConfigured:
+ logger.error("Django is not properly configured: %s" % traceback.format_exc().splitlines()[-1])
+ raise UpdaterError
except:
logger.error("Error while updating the database")
for x in traceback.format_exc().splitlines():