From 7c065b65e11dc46f326fd492ca6dac37ee4d8d2f Mon Sep 17 00:00:00 2001
From: Pjotr Prins
Date: Thu, 6 Oct 2016 14:40:21 +0000
Subject: Logger: add more granular debug messages

---
 wqflask/base/data_set.py  |  3 ++-
 wqflask/utility/logger.py | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'wqflask')

diff --git a/wqflask/base/data_set.py b/wqflask/base/data_set.py
index 8bd5bfb9..fddfce58 100644
--- a/wqflask/base/data_set.py
+++ b/wqflask/base/data_set.py
@@ -107,7 +107,8 @@ Publish or ProbeSet. E.g.
                         else:
                             new_type = "ProbeSet"
                         self.datasets[short_dataset_name] = new_type
-        logger.debug("datasets",self.datasets)
+        # Set LOG_LEVEL_DEBUG=5 to see the following:
+        logger.debugf(5,"datasets",self.datasets)
 
     def __call__(self, name):
         return self.datasets[name]
diff --git a/wqflask/utility/logger.py b/wqflask/utility/logger.py
index b873e16f..bacb0aa4 100644
--- a/wqflask/utility/logger.py
+++ b/wqflask/utility/logger.py
@@ -50,11 +50,20 @@ class GNLogger:
         self.logger.setLevel(value)
 
     def debug(self,*args):
+        """Call logging.debug for multiple args. Use (lazy) debugf and
+level=num to filter on LOG_LEVEL_DEBUG.
+
+        """
+        self.collect(self.logger.debug,*args)
+
+    def debug20(self,*args):
         """Call logging.debug for multiple args. Use level=num to filter on
 LOG_LEVEL_DEBUG (NYI).
 
         """
-        self.collect(self.logger.debug,*args)
+        if level <= LOG_LEVEL_DEBUG:
+            if self.logger.getEffectiveLevel() < 20:
+                self.collect(self.logger.debug,*args)
 
     def info(self,*args):
         """Call logging.info for multiple args"""
@@ -79,7 +88,10 @@ LOG_LEVEL_DEBUG (NYI).
             self.collectf(self.logger.debug,*args)
 
     def debugf(self,level=0,*args):
-        """Call logging.debug for multiple args lazily"""
+        """Call logging.debug for multiple args lazily and handle
+        LOG_LEVEL_DEBUG correctly
+
+        """
         # only evaluate function when logging
         if level <= LOG_LEVEL_DEBUG:
             if self.logger.getEffectiveLevel() < 20:
-- 
cgit v1.2.3