update settings and tests to not double log either

dimagi · Mar 5, 2014 · 19ad8e0 · 19ad8e0
1 parent 63c41d1
commit 19ad8e0
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/couchlog/tests.py b/couchlog/tests.py
@@ -17,6 +17,9 @@ def setUp(self):
         # imperative config
         self.logger = logging.getLogger('couchlog.tests')
         self.original_log_level = logging.root.getEffectiveLevel()
+        for handler in list(self.logger.handlers):
+            if isinstance(handler, CouchHandler):
+                self.logger.removeHandler(handler)
         logging.root.setLevel(logging.ERROR)
         init_handler()
 

diff --git a/settings.py b/settings.py
@@ -2,6 +2,7 @@
 
 SECRET_KEY = 'this is not a secret key'
 
+print 'couchlog settings'
 INSTALLED_APPS = (
     'couchlog',
     'couchdbkit.ext.django',
@@ -44,16 +45,16 @@
 LOGGING = {
     'version': 1,
     'handlers': {
-        'couchlog': {
-            'level': 'WARNING',
-            'class': 'couchlog.handlers.CouchHandler',
+        'null': {
+            'level': 'DEBUG',
+            'class': 'django.utils.log.NullHandler',
         },
     },
     'loggers': {
-        'couchlog.tests': {
-            'level': 'INFO',
-            'propagate': True,
-            'handlers': ['couchlog'],
+        '': {
+            'level': 'CRITICAL',
+            'handler': 'null',
+            'propagate': False,
         }
     }
 }