Changeset 2448 for trunk

Timestamp:

03/29/12 15:26:17 (13 years ago)

Author:

Malte Marquarding

Message:

Fix rcParamsverbose handling. This was ignored.

File:

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

trunk/python/logging.py

@@ -56 +56 @@
             logs = self.logger.pop().strip()
             if len(logs) > 0:
-                print >>sys.stdout, logs
-                sys.stdout.flush()
+                if rcParams['verbose']:
+                    print >>sys.stdout, logs
+                    if hasattr(sys.stdout, "flush"):
+                        sys.stdout.flush()
         self._log = ""
 
@@ -110 +112 @@
         level = "INFO"
         try:
-            val = f(*args, **kw)
-            return val
-        except Exception, ex:
-            level = "ERROR"
-            asaplog.push(str(ex))
-            if rcParams['verbose']:
-                pass
-            else:
-                raise
+            try:
+                val = f(*args, **kw)
+                return val
+            except Exception, ex:
+                level = "ERROR"
+                asaplog.push(str(ex))
+                if rcParams['verbose']:
+                    pass
+                else:
+                    raise
         finally:
             asaplog.post(level, f.func_name)
-            #asaplog.post(level, ".".join([f.__module__,f.func_name]))
     return wrap_it