Changeset 1859 for trunk/python/logging.py

Timestamp:

08/05/10 14:40:38 (14 years ago)

Author:

Malte Marquarding

Message:

Ticket #193: the rcParamsverbose? flag is only used in standard asap cli mode. Otherwise log messages are always send to the logger and one needs to call asaplog.disable()/asaplog.enable() to controls this. I have also added the function name as the log origin.

File:

• trunk/python/logging.py (modified) (6 diffs)

trunk/python/logging.py

@@ -19 +19 @@
 
     .. note:: Do instantiate a new one - use the :obj:`asaplog` instead.
-    
+
     """
     def __init__(self):
-        self._enabled = False
+        self._enabled = True
         self._log = ""
         if is_casapy():
@@ -31 +31 @@
             set_global_sink(self.logger)
 
-    def post(self, level):
+    def post(self, level, origin=""):
         """Post the messages to the logger. This will clear the buffered
         logs.
@@ -42 +42 @@
         if not self._enabled:
             return
-        if not rcParams['verbose']:
-            return
 
         logs = self._log.strip()
         if len(logs) > 0:
-           self.logger.post(logs, priority=level)
+            self.logger.post(logs, priority=level, origin=origin)
         if isinstance(self.logger, LogSink):
             logs = self.logger.pop().strip()
@@ -64 +62 @@
 
         """
-        from asap import rcParams
         if self._enabled:
-            if rcParams["verbose"]:
-                sep = ""
-                self._log = sep.join([self._log, msg])
-                if newline:
-                    self._log += "\n"
+            sep = ""
+            self._log = sep.join([self._log, msg])
+            if newline:
+                self._log += "\n"
 
     def enable(self, flag=True):
@@ -80 +76 @@
         self._enabled = flag
 
+    def is_enabled(self):
+        return self._enabled
+
 asaplog = AsapLogger()
 """Default asap logger"""
 
-def print_log_dec(f, level='INFO'):
+def print_log_dec(f):
     """Decorator which posts log at completion of the wrapped method.
+
     Example::
 
@@ -96 +96 @@
     @wraps_dec(f)
     def wrap_it(*args, **kw):
-        val = f(*args, **kw)
-        print_log(level)
-        return val
+        level = "INFO"
+        try:
+            val = f(*args, **kw)
+            return val
+        except Exception, ex:
+            level = "ERROR"
+            asaplog.push(str(ex))
+            if rcParams['verbose']:
+                pass
+            else:
+                raise
+        finally:
+            print_log(level, f.func_name)
     return wrap_it
 
-def print_log(level='INFO'):
+def print_log(level='INFO', origin=""):
     """Alias for asaplog.post(level)"""
-    asaplog.post(level)
+    asaplog.post(level, origin)