Changeset 442 for trunk/src/__init__.py

Timestamp:

11/11/09 17:02:19 (3 years ago)

Author:

apdavison

Message:

Some tweaks to the init_logging() function and other logging-related stuff. Perhaps this should be moved out of NeuroTools/__init__.py into its own module?

Files:

• trunk/src/__init__.py (modified) (5 diffs)

trunk/src/__init__.py

@@ -39 +39 @@
 __version__ = "0.1.0 (Asynchronous Astrocyte)"
 import warnings
+from operator import __or__
 
 #########################################################
@@ -126 +127 @@
 
 # Add a header() level to logging
-logging.HEADER = 60
+logging.HEADER = (logging.WARNING + logging.ERROR)/2 # higher than warning, lower than error
 logging.addLevelName(logging.HEADER, 'HEADER')
 
@@ -168 +169 @@
     }
     
-    def __init__(self, fmt=None, datefmt=None, colours=DEFAULT_COLOURS):
+    def __init__(self, fmt=None, datefmt=None, colours=DEFAULT_COLOURS, mpi_rank=None):
         logging.Formatter.__init__(self, fmt, datefmt)
         self._colours = colours
         self._indents = FancyFormatter.DEFAULT_INDENTS
+        if mpi_rank is None:
+            self.prefix = ""
+        else:
+            self.prefix = "%-3d" % mpi_rank
     
     def format(self, record):
@@ -179 +184 @@
         if self._colours:
             s = colour(self._colours[record.levelname], s)
-        return self._indents[record.levelname] + s
+        return self.prefix + self._indents[record.levelname] + s
 
 
 class NameOrLevelFilter(logging.Filter):
     """
-    Logging filter which allows messages that either meet the same name criteria
-    as the base filter class, or have a level >= the level specified.
+    Logging filter which allows messages that either have an approved name, or
+    have a level >= the level specified.
     
     The intended use is when you want to receive most messages at a high level,
@@ -191 +196 @@
     particular component.
     """
-    def __init__(self, name='', level=logging.INFO):
-        self.name = name
-        self.nlen = len(name)
+    def __init__(self, names=[], level=logging.INFO):
+        self.names = names
         self.level = level
         
     def filter(self, record):
-        allow_by_name = logging.Filter.filter(self, record)
+        if len(self.names) == 0:
+            allow_by_name = True
+        else:
+            allow_by_name = record.name in self.names
         allow_by_level = record.levelno >= self.level
         return (allow_by_name or allow_by_level)
-    
-
-def init_logging(filename, file_level=logging.INFO, console_level=logging.WARNING):
+
+
+def init_logging(filename, file_level=logging.INFO, console_level=logging.WARNING, mpi_rank=None):
+    if mpi_rank is None:
+        mpi_fmt = ""
+    else:
+        mpi_fmt = "%3d " % mpi_rank
     logging.basicConfig(level=file_level,
-                        format='%(asctime)s %(name)-10s %(levelname)-6s %(message)s [%(pathname)s:%(lineno)d]',
+                        format='%%(asctime)s %s%%(name)-10s %%(levelname)-6s %%(message)s [%%(pathname)s:%%(lineno)d]' % mpi_fmt,
                         filename=filename,
                         filemode='w')
     console = logging.StreamHandler()
     console.setLevel(console_level)
-    console.setFormatter(FancyFormatter('%(message)s'))
+    console.setFormatter(FancyFormatter('%(message)s', mpi_rank=mpi_rank))
     logging.getLogger('').addHandler(console)
     return console