Changeset 3289 for branches

Timestamp:

01/26/12 21:07:16 (4 months ago)

Author:

erkn

Message:

Clean up logging a bit

Location:

branches/mcxtrace-1.0/src/mcrun2

Files:

• log.py (modified) (1 diff)
• main.py (modified) (4 diffs)
• mcstas.py (modified) (2 diffs)
• optimisation.py (modified) (1 diff)

branches/mcxtrace-1.0/src/mcrun2/log.py

@@ -1 +1 @@
 
-# TODO: Move logging facilities to this module
+import logging
+
+# import and re-export log levels
+from logging import DEBUG, INFO, WARNING, ERROR, CRITICAL, FATAL
+
+HANDLER = None
 
 
 class McRunException(Exception):
     pass
+
+
+def setupLogger():
+    """ Setup logging facilities """
+    formatter = logging.Formatter('%(created).2f, %(levelname)8s: %(message)s')
+
+    global HANDLER
+    HANDLER = logging.StreamHandler()
+    HANDLER.setLevel(logging.INFO)
+    HANDLER.setFormatter(formatter)
+
+    root = logging.getLogger()
+    root.setLevel(logging.DEBUG)
+    root.addHandler(HANDLER)
+
+
+def setLogLevel(level):
+    """ Set global level (e.g. debug) """
+    HANDLER.setLevel(level)
+
+
+def getLogger(name):
+    """ Get sub logger (e.g. optimisation) """
+    return logging.getLogger("mcstas." + name)

branches/mcxtrace-1.0/src/mcrun2/main.py

@@ -1 +1 @@
 #!/usr/bin/env python2.6
-
-import logging
-from log import McRunException
 
 from os.path import isfile, isdir, abspath, dirname
@@ -12 +9 @@
 from optimisation import Scanner, LinearInterval, MultiInterval
 
-LOG = logging.getLogger('mcstas')
+from log import getLogger, setupLogger, setLogLevel, McRunException
+from log import DEBUG
+LOG = getLogger('main')
 
 # File path friendly date format (avoid ':' and white space)
@@ -227 +226 @@
 def main():
     ''' Main routine '''
-
-    # Setup logging
-    formatter = logging.Formatter('%(created).2f, %(levelname)8s: %(message)s')
-
-    handler = logging.StreamHandler()
-    handler.setLevel(logging.INFO)
-    handler.setFormatter(formatter)
-
-    LOG.setLevel(logging.DEBUG)
-    LOG.addHandler(handler)
+    setupLogger()
 
     # Add options
@@ -251 +241 @@
 
     if options.verbose:
-        handler.setLevel(logging.DEBUG)
+        setLogLevel(DEBUG)
 
     # Inform user of what is happening

branches/mcxtrace-1.0/src/mcrun2/mcstas.py

@@ -1 +1 @@
 
 import atexit
-import logging
 import os
 import re
@@ -11 +10 @@
 from decimal import Decimal
 
-
-LOG = logging.getLogger('mcstas.mcstas')
+from log import getLogger
+LOG = getLogger('mcstas')
 
 

branches/mcxtrace-1.0/src/mcrun2/optimisation.py

@@ -3 +3 @@
 from log import McRunException
 
-import logging
-LOG = logging.getLogger('mcstas.optimisation')
+from log import getLogger
+LOG = getLogger('optimisation')
 
 from datetime import datetime