Permalink
Browse files

only use molly logging if LOGGING_CONFIG is set to None

  • Loading branch information...
1 parent 852719d commit 1caafe1830660d704231154414b07e7ab7193ed9 @martinfilliau martinfilliau committed Mar 6, 2012
Showing with 8 additions and 7 deletions.
  1. +8 −7 molly/conf/settings.py
View
@@ -1,9 +1,9 @@
import imp
from django.utils.importlib import import_module
-from django.conf.urls.defaults import patterns
from django.conf.urls.defaults import include as urlconf_include
from django.core.urlresolvers import RegexURLResolver, RegexURLPattern
+from django.conf import settings
"""
Provides a framework for Molly application objects.
@@ -101,12 +101,13 @@ def get(self):
# Configure any logging for this application, passing the
# configuration lest it needs it.
- try:
- logconfig = import_module(self.application_name + '.logconfig')
- except ImportError, e:
- pass
- else:
- logconfig.configure_logging(self.conf)
+ if settings.LOGGING_CONFIG is None:
+ try:
+ logconfig = import_module(self.application_name + '.logconfig')
+ except ImportError, e:
+ pass
+ else:
+ logconfig.configure_logging(self.conf)
return self.conf

0 comments on commit 1caafe1

Please sign in to comment.