diff options
| author | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-25 11:24:35 -0500 |
|---|---|---|
| committer | Chris St. Pierre <chris.a.st.pierre@gmail.com> | 2013-11-25 11:24:35 -0500 |
| commit | 16b4744544ab140c4ab9bc733a7dfa76cf4e578c (patch) | |
| tree | a36ab3e0765707318866b5d3b69fe06a0bec96a9 /src/lib/Bcfg2/Server/Core.py | |
| parent | bcea1949fa2a84e87c51d128a17a25a70d50ca13 (diff) | |
| download | bcfg2-16b4744544ab140c4ab9bc733a7dfa76cf4e578c.tar.gz bcfg2-16b4744544ab140c4ab9bc733a7dfa76cf4e578c.tar.bz2 bcfg2-16b4744544ab140c4ab9bc733a7dfa76cf4e578c.zip | |
Core: Avoid starting server if database is enabled but cannot be used
Plugins that use the database often act quite differently depending on
whether or not the database is enabled. If we start the server
without the database (e.g., the connection failed), then Very Strange
Things can happen.
Diffstat (limited to 'src/lib/Bcfg2/Server/Core.py')
| -rw-r--r-- | src/lib/Bcfg2/Server/Core.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/Bcfg2/Server/Core.py b/src/lib/Bcfg2/Server/Core.py index 5ec1b5bce..c2cf6b7a4 100644 --- a/src/lib/Bcfg2/Server/Core.py +++ b/src/lib/Bcfg2/Server/Core.py @@ -228,11 +228,11 @@ class BaseCore(object): verbosity=0) self._database_available = True except ImproperlyConfigured: - err = sys.exc_info()[1] - self.logger.error("Django configuration problem: %s" % err) + self.logger.error("Django configuration problem: %s" % + sys.exc_info()[1]) except: - err = sys.exc_info()[1] - self.logger.error("Database update failed: %s" % err) + self.logger.error("Database update failed: %s" % + sys.exc_info()[1]) if do_chown and self._database_available: try: |