Catches SIGHUP/SIGUSR1 to trigger conf reload

[mpd-sima.git] / sima / lib / logger.py

diff --git a/sima/lib/logger.py b/sima/lib/logger.py
index 761769bbdfd4066cba7cac4c52da5c01122472fa..bde62d7f83b01cd1ca07e2a70112284808712191 100644 (file)
--- 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 Jack Kaliko <kaliko@azylum.org>
 #
 #  This file is part of sima
 #
@@ -29,9 +29,10 @@ import sys
 
 
 LOG_FORMATS = {
-        logging.DEBUG: '{asctime} {filename}:{lineno}({funcName}) '
-                                 '{levelname}: {message}',
-        logging.INFO:  '{asctime} {levelname}: {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"
 
@@ -70,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))
-
-        # 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)