X-Git-Url: http://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Flogger.py;h=a4ed23de4f2b9c5c985edb8ff03d6383577837d0;hb=24993cd99b847733894f57fd004ed52b5390244a;hp=8c6cd2ff0b38ba346d982ed49b2d9093342e21a8;hpb=5fe20b6caffe162afe5be18e77fe40004d00c95e;p=mpd-sima.git

diff --git a/sima/lib/logger.py b/sima/lib/logger.py
index 8c6cd2f..a4ed23d 100644
--- a/sima/lib/logger.py
+++ b/sima/lib/logger.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2010, 2013 Jack Kaliko <efrim@azylum.org>
+# Copyright (c) 2009, 2010, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -23,13 +23,16 @@
 Logging facility for sima.
 """
 
+# standard library import
 import logging
 import sys
 
+
 LOG_FORMATS = {
-        logging.DEBUG: '{asctime} {filename}:{lineno}({funcName}) '
-                                 '{levelname}: {message}',
-        logging.INFO:  '{asctime} {levelname}: {message}'
+        logging.DEBUG:  '{asctime} {filename: >11}:{lineno: <3} {levelname: <7}: {message}',
+        logging.INFO:  '{asctime} {levelname: <7}: {message}',
+        #logging.DEBUG: '{asctime} {filename}:{lineno}({funcName}) '
+                                 #'{levelname}: {message}',
         }
 DATE_FMT = "%Y-%m-%d %H:%M:%S"
 
@@ -68,15 +71,17 @@ def set_logger(level='info', logfile=None, name='sima'):
         fileh = logging.FileHandler(logfile)
         #fileh.setLevel(user_log_level)
         fileh.setFormatter(formatter)
-        logg.addHandler(fileh)
+        if not logg.hasHandlers():
+            logg.addHandler(fileh)
     else:
-        # create console handler with a specified log level (STDOUT)
-        couth = logging.StreamHandler(sys.stdout)
-        #couth.setLevel(user_log_level)
-        couth.addFilter(LevelFilter(logging.WARNING))
+        if not logg.hasHandlers():
+            # create console handler with a specified log level (STDOUT)
+            couth = logging.StreamHandler(sys.stdout)
+            #couth.setLevel(user_log_level)
+            couth.addFilter(LevelFilter(logging.WARNING))
 
-        # create console handler with warning log level (STDERR)
-        cerrh = logging.StreamHandler(sys.stderr)
+            # create console handler with warning log level (STDERR)
+            cerrh = logging.StreamHandler(sys.stderr)
         #cerrh.setLevel(logging.WARNING)
         cerrh.setLevel(logging.ERROR)