summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
authorClaude Paroz <claude@2xlibre.net>2012-09-24 22:11:42 +0200
committerClaude Paroz <claude@2xlibre.net>2012-09-24 22:12:45 +0200
commitfc69fff9ab5bba8a6cff3eaf51f02a3204b1c015 (patch)
treec8ef89d4346f70b560d952f4aca168135ae6d5bc /django
parente72e22e518a730cd28cd68c9374fa79a45e27a9c (diff)
Fixed #14861 -- Moved logging config outside of Settings.__init__
Thanks donspaulding for the report and simonpercivall for the initial patch.
Diffstat (limited to 'django')
-rw-r--r--django/conf/__init__.py30
1 files changed, 16 insertions, 14 deletions
diff --git a/django/conf/__init__.py b/django/conf/__init__.py
index 6272f4ed5d..d636ff0b6c 100644
--- a/django/conf/__init__.py
+++ b/django/conf/__init__.py
@@ -43,13 +43,28 @@ class LazySettings(LazyObject):
% (name, ENVIRONMENT_VARIABLE))
self._wrapped = Settings(settings_module)
-
+ self._configure_logging()
def __getattr__(self, name):
if self._wrapped is empty:
self._setup(name)
return getattr(self._wrapped, name)
+ def _configure_logging(self):
+ """
+ Setup logging from LOGGING_CONFIG and LOGGING settings.
+ """
+ if self.LOGGING_CONFIG:
+ # First find the logging configuration function ...
+ logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
+ logging_config_module = importlib.import_module(logging_config_path)
+ logging_config_func = getattr(logging_config_module, logging_config_func_name)
+
+ # Backwards-compatibility shim for #16288 fix
+ compat_patch_logging_config(self.LOGGING)
+
+ # ... then invoke it with the logging settings
+ logging_config_func(self.LOGGING)
def configure(self, default_settings=global_settings, **options):
"""
@@ -133,19 +148,6 @@ class Settings(BaseSettings):
os.environ['TZ'] = self.TIME_ZONE
time.tzset()
- # Settings are configured, so we can set up the logger if required
- if self.LOGGING_CONFIG:
- # First find the logging configuration function ...
- logging_config_path, logging_config_func_name = self.LOGGING_CONFIG.rsplit('.', 1)
- logging_config_module = importlib.import_module(logging_config_path)
- logging_config_func = getattr(logging_config_module, logging_config_func_name)
-
- # Backwards-compatibility shim for #16288 fix
- compat_patch_logging_config(self.LOGGING)
-
- # ... then invoke it with the logging settings
- logging_config_func(self.LOGGING)
-
class UserSettingsHolder(BaseSettings):
"""