X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flib%2Flogger.py;h=3b287e26390859d47c2b11b7af7dedfecca88f81;hb=85f15b7261386985e8bb7f9b357e55b5f21c21a7;hp=ebe6c27142946932dfa23fd4826634eb61e37c8b;hpb=cf5fee72c57cf6b6f09b9caa78ab9e547f1d7542;p=mpd-sima.git

diff --git a/sima/lib/logger.py b/sima/lib/logger.py
index ebe6c27..3b287e2 100644
--- a/sima/lib/logger.py
+++ b/sima/lib/logger.py
@@ -1,6 +1,5 @@
 # -*- coding: utf-8 -*-
-
-# Copyright (c) 2009, 2010, 2013 Jack Kaliko <kaliko@azylum.org>
+# Copyright (c) 2009, 2010, 2013, 2014 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -29,10 +28,10 @@ import sys
 
 
 LOG_FORMATS = {
+        logging.DEBUG: '{asctime} {filename: >11}:{lineno: <3} {levelname: <7}: {message}',
+        logging.INFO:  '{asctime} {levelname: <7}: {message}',
         #logging.DEBUG: '{asctime} {filename}:{lineno}({funcName}) '
                                  #'{levelname}: {message}',
-        logging.DEBUG:  '{asctime} {filename}:{lineno}  {levelname}: {message}',
-        logging.INFO:  '{asctime} {levelname}: {message}',
         }
 DATE_FMT = "%Y-%m-%d %H:%M:%S"
 
@@ -71,15 +70,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))
-
-        # create console handler with warning log level (STDERR)
-        cerrh = logging.StreamHandler(sys.stderr)
+        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)
         #cerrh.setLevel(logging.WARNING)
         cerrh.setLevel(logging.ERROR)