X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=03baa4fa5e9af85b68b9b66a91152aa17aa8e9b6;hb=194de8ab2773bd8e456590e3876a0aca1fe4d564;hp=a25b31333672592c22b627f4f4d85ad1f8a57e91;hpb=24993cd99b847733894f57fd004ed52b5390244a;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index a25b313..03baa4f 100644
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -41,6 +41,7 @@ from .utils.utils import exception_log, SigHup
  # core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
+from .plugins.core.uniq import Uniq
 ##
 
 
@@ -49,7 +50,7 @@ def load_plugins(sima, source):
         sima:   sima.core.Sima instance
         source: ['internal', 'contrib']
     """
-    if not sima.config.get('sima', source ):
+    if not sima.config.get('sima', source):
         return
     logger = logging.getLogger('sima')
     for plugin in sima.config.get('sima', source).split(','):
@@ -58,7 +59,8 @@ def load_plugins(sima, source):
         try:
             mod_obj = __import__(module, fromlist=[plugin])
         except ImportError as err:
-            logger.error('Failed to load plugin\'s module: {0} ({1})'.format(module, err))
+            logger.error('Failed to load plugin\'s module: ' +
+                         '{0} ({1})'.format(module, err))
             sima.shutdown()
             sys.exit(1)
         try:
@@ -67,7 +69,8 @@ def load_plugins(sima, source):
             logger.error('Failed to load plugin {0} ({1})'.format(plugin, err))
             sima.shutdown()
             sys.exit(1)
-        logger.info('Loading {0} plugin: {name} ({doc})'.format(source, **plugin_obj.info()))
+        logger.info('Loading {0} plugin: {name} ({doc})'.format(
+                             source, **plugin_obj.info()))
         sima.register_plugin(plugin_obj)
 
 
@@ -77,15 +80,13 @@ def start(sopt, restart=False):
     # set logger
     verbosity = sopt.options.get('verbosity', 'warning')
     logfile = sopt.options.get('logfile', None)
-    cli_loglevel = getattr(logging, verbosity.upper())
-    set_logger(level=verbosity, logfile=logfile)
-    logger = logging.getLogger('sima')
-    logger.setLevel(cli_loglevel)
+    set_logger(verbosity, logfile)
     # loads configuration
-    config = ConfMan(logger, sopt.options).config
-    logger.setLevel(getattr(logging,
-                    config.get('log', 'verbosity').upper()))  # pylint: disable=E1103
-
+    config = ConfMan(sopt.options).config
+    logfile = config.get('log', 'logfile')
+    verbosity = config.get('log', 'verbosity')
+    set_logger(verbosity, logfile)
+    logger = logging.getLogger('sima')
     logger.debug('Command line say: {0}'.format(sopt.options))
     # Create Database
     db_file = config.get('sima', 'db_file')
@@ -102,14 +103,17 @@ def start(sopt, restart=False):
     sima = core.Sima(config)
 
     # required core plugins
-    sima.register_plugin(History)
-    sima.register_plugin(MpdOptions)
+    core_plugins = [History, MpdOptions, Uniq]
+    for cplgn in core_plugins:
+        logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
+        sima.register_plugin(cplgn)
 
     #  Loading internal plugins
     load_plugins(sima, 'internal')
 
     #  Loading contrib plugins
     load_plugins(sima, 'contrib')
+
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):
         if restart:
@@ -133,13 +137,14 @@ def run(sopt, restart=False):
     # pylint: disable=broad-except
     try:
         start(sopt, restart)
-    except SigHup as err:  # SigHup inherit from Exception
+    except SigHup:  # SigHup inherit from Exception
         run(sopt, True)
     except Exception:  # Unhandled exception
         exception_log()
 
 # Script starts here
 def main():
+    """Entry point"""
     nfo = dict({'version': info.__version__,
                  'prog': 'sima'})
     # StartOpt gathers options from command line call (in StartOpt().options)