conduit r1865 - in trunk: . conduit

[jstowers svn gnome org]

Author: jstowers
Date: Thu Feb 12 11:53:08 2009
New Revision: 1865
URL: http://svn.gnome.org/viewvc/conduit?rev=1865&view=rev

Log:
2009-02-13  Alexandre Rosenfeld  <airmind gmail com>

	* conduit/Logging.py: Coloured logging output.



Modified:
   trunk/ChangeLog
   trunk/conduit/Logging.py

Modified: trunk/conduit/Logging.py
==============================================================================
--- trunk/conduit/Logging.py	(original)
+++ trunk/conduit/Logging.py	Thu Feb 12 11:53:08 2009
@@ -2,30 +2,61 @@
 import logging
 import conduit
 
+#The terminal has 8 colors with codes from 0 to 7
+BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8)
+
+#These are the sequences need to get colored ouput
+RESET_SEQ = "\033[0m"
+COLOR_SEQ = "\033[1;%dm"
+BOLD_SEQ =  "\033[1m"
+
+#The background is set with 40 plus the number of the color, 
+#and the foreground with 30
+COLORS = {
+    'WARNING':  COLOR_SEQ % (30 + YELLOW) + 'WARNING' + RESET_SEQ,
+    'INFO':     COLOR_SEQ % (30 + WHITE) + 'INFO' + RESET_SEQ,
+    'DEBUG':    COLOR_SEQ % (30 + BLUE) + 'DEBUG' + RESET_SEQ,
+    'CRITICAL': COLOR_SEQ % (30 + YELLOW) + 'CRITICAL' + RESET_SEQ,
+    'ERROR':    COLOR_SEQ % (30 + RED) + 'ERROR' + RESET_SEQ,
+}
+
+class ColoredFormatter(logging.Formatter):
+    def __init__(self, msg, use_color = True):
+        logging.Formatter.__init__(self, msg)
+        self.use_color = use_color
+    
+    def format(self, record):
+        if self.use_color:
+            record.levelname = COLORS.get(record.levelname, record.levelname)
+        return logging.Formatter.format(self, record)
+
 # Custom logger class with multiple destinations
 class ConduitLogger(logging.Logger):
-    FORMAT = "[%(name)-20s][%(levelname)-7s] %(message)s (%(filename)s:%(lineno)d)"
+    COLOR_FORMAT = "["+BOLD_SEQ+"%(name)-20s"+RESET_SEQ+"][%(levelname)-18s]  %(message)s ("+BOLD_SEQ+"%(filename)s"+RESET_SEQ+":%(lineno)d)"
+    NO_COLOR_FORMAT = "[%(name)-20s][%(levelname)-18s]  %(message)s (%(filename)s:%(lineno)d)"
     LOG_FILE_HANDLER = None
     def __init__(self, name):
         try:
             level = getattr(logging,os.environ.get('CONDUIT_LOGLEVEL','DEBUG'))
         except AttributeError:
             level = logging.DEBUG
-        logging.Logger.__init__(self, name, level)
+        logging.Logger.__init__(self, name, level)                
         
         #Add two handlers, a stderr one, and a file one
-        formatter = logging.Formatter(ConduitLogger.FORMAT)
+        color_formatter = ColoredFormatter(ConduitLogger.COLOR_FORMAT)
+        no_color_formatter = ColoredFormatter(ConduitLogger.NO_COLOR_FORMAT, False)
         
         #create the single file appending handler
         if ConduitLogger.LOG_FILE_HANDLER == None:
             filename = os.environ.get('CONDUIT_LOGFILE',os.path.join(conduit.USER_DIR,'conduit.log'))
             ConduitLogger.LOG_FILE_HANDLER = logging.FileHandler(filename,'w')
-            ConduitLogger.LOG_FILE_HANDLER.setFormatter(formatter)
+            ConduitLogger.LOG_FILE_HANDLER.setFormatter(no_color_formatter)
 
         console = logging.StreamHandler()
-        console.setFormatter(formatter)
+        console.setFormatter(color_formatter)
         
         self.addHandler(ConduitLogger.LOG_FILE_HANDLER)
         self.addHandler(console)
         return
+
 logging.setLoggerClass(ConduitLogger)