Changeset 6888

Timestamp:

Apr 23, 2009, 4:47:07 PM (16 years ago)

Author:

rwilson

Message:

Back-ported changes in logging.

Files:

• anuga_core/source/anuga/utilities/log.py (modified) (4 diffs)
• branches/numpy/anuga/utilities/log.py (modified) (1 diff)

anuga_core/source/anuga/utilities/log.py

@@ -20 +20 @@
 
 Note that this module uses features of the logging package that were introduced
-in python2.5.  If running on earlier versions, these features are disables:
-    . Module name + line number
+in python2.5.  If running on earlier versions, these features are disabled:
+    . Calling module name + line number
 '''
 
@@ -85 +85 @@
     if not _setup:
         # sanity check the logging levels, require console >= file
-        if console_logging_level < log_logging_level:
+        if log_logging_level > console_logging_level:
             log_logging_level = console_logging_level
 
@@ -121 +121 @@
     frames = traceback.extract_stack()
     frames.reverse()
+    (_, mod_name) = __name__.rsplit('.', 1)
     for (fpath, lnum, mname, _) in frames:
-        fname = os.path.basename(mname).rsplit('.', 1)[0]
-        if mname != __name__:
+        (fname, _) = os.path.basename(fpath).rsplit('.', 1)
+        if fname != mod_name:
             break
 
@@ -165 +166 @@
     log(logging.CRITICAL, msg)
 
-def resource_usage(level=logging.CRITICAL):
-    '''Log resource usage at given log level.'''
+##
+# @brief Log memory usage at time of call.
+# @param level Override the default INFO logging level.
+# @note From http://code.activestate.com/recipes/286222/.
+def resource_usage(level=logging.INFO):
+    '''Log memory usage at given log level.'''
 
     if sys.platform != 'win32':

branches/numpy/anuga/utilities/log.py

@@ -18 +18 @@
 Until the first call to log() the user is free to play with the module data
 to configure the logging.
+
 Note that this module uses features of the logging package that were introduced
 in python2.5.  If running on earlier versions, these features are disabled: