Changeset 7091

Timestamp:

May 27, 2009, 8:00:10 AM (16 years ago)

Author:

rwilson

Message:

Additio0ns to the log module.

Location:

branches/numpy/anuga/utilities

Files:

• log.py (modified) (7 diffs)
• win_stuff.py (added)

branches/numpy/anuga/utilities/log.py

@@ -7 +7 @@
 Use it this way:
     import anuga.utilities.log as log
-    log.console_logging_level = log.DEBUG
+
+    # configure my logging
+    log.console_logging_level = log.INFO
+    log.log_logging_level = log.DEBUG
+    log.log_filename('./my.log')
+
+    # log away!
     log.debug('A message at DEBUG level')
     log.info('Another message, INFO level')
 
 This class uses the 'borg' pattern - there is never more than one instance
-of log data.  See
+of log data.  See the URL for the basic idea used here: modules *are*
+singletons!
+
 <http://www.suttoncourtenay.org.uk/duncan/accu/pythonpatterns.html>
-for the basic idea used here: modules *are* singletons!
 
 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:
+Note that this module uses some features of the logging package that were
+introduced in python2.5.  If running on earlier versions, the following
+features are disabled:
     . Calling module name + line number
 '''
@@ -59 +67 @@
 NOTSET = logging.NOTSET
 
-# set new_python to True if python version 2.5 or later
-(version_major, version_minor, _, _, _) = sys.version_info
-new_python = ((version_major == 2 and version_minor >= 5) or version_major > 2)
+# set _new_python to True if python version 2.5 or later
+_new_python = (sys.version_info >= 0x02050000)      # 2.5.x.x
 
 
@@ -89 +96 @@
 
         # setup the file logging system
-        if new_python:
+        if _new_python:
             fmt = '%(asctime)s %(levelname)-8s %(mname)25s:%(lnum)-4d|%(message)s'
         else:
@@ -112 +119 @@
                         logging.getLevelName(log_logging_level),
                         logging.getLevelName(console_logging_level)))
-        if new_python:
+        if _new_python:
             logging.log(logging.CRITICAL, start_msg,
                         extra={'mname': __name__, 'lnum': 0})
@@ -133 +140 @@
             break
 
-    if new_python:
+    # why are we here? ... Oh yes! Log the message!
+    if _new_python:
         logging.log(level, msg, extra={'mname': fname, 'lnum': lnum})
     else:
@@ -140 +148 @@
 ##
 # @brief Hook function to process uncaught exceptions.
-# @param type
-# @param value
-# @param traceback
+# @param type Type of exception.
+# @param value Exception data.
+# @param traceback Traceback object.
 # @note Same interface as sys.excepthook()
 def log_exception_hook(type, value, tb):
@@ -252 +260 @@
 
     test_it()
+    info('sys.version_info=%s, _new_python=%s'
+         % (str(sys.version_info), str(_new_python)))