X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=538238bee3fdc525998e2cbdf5051f6295e269bd;hb=abd0ec90f9ae6ea8eae2bc1515fcc8358bb6d4c9;hp=c472567b08ead7b91477a8185bf844515449a426;hpb=54849baefbe39c4c0a09bd8ad27bde7743dac5ef;p=mpd-sima.git

diff --git a/sima/launch.py b/sima/launch.py
index c472567..538238b 100644
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -37,7 +37,7 @@ from .lib.logger import set_logger
 from .lib.simadb import SimaDB
 from .utils.config import ConfMan
 from .utils.startopt import StartOpt
-from .utils.utils import exception_log, SigHup
+from .utils.utils import exception_log, SigHup, PluginConfException
 # core plugins
 from .plugins.core.history import History
 from .plugins.core.mpdoptions import MpdOptions
@@ -72,7 +72,11 @@ def load_plugins(sima, source):
             sys.exit(1)
         logger.info('Loading {0} plugin: {name} ({doc})'.format(
             source, **plugin_obj.info()))
-        sima.register_plugin(plugin_obj)
+        try:
+            sima.register_plugin(plugin_obj)
+        except PluginConfException as err:
+            logger.error(err)
+            sys.exit(2)
 
 
 def start(sopt, restart=False):
@@ -111,13 +115,12 @@ def start(sopt, restart=False):
         core_plugins = [History, MpdOptions]
         config['sima']['musicbrainzid'] = 'False'
     for cplgn in core_plugins:
-        logger.debug('Register core {name} ({doc})'.format(**cplgn.info()))
+        logger.debug('Register core %(name)s (%(doc)s)', cplgn.info())
         sima.register_core_plugin(cplgn)
-    logger.debug('core loaded, prioriy: {}'.format(' > '.join(map(str, sima.core_plugins))))
+    logger.debug('core loaded, prioriy: %s', ' > '.join(map(str, sima.core_plugins)))
 
     #  Loading internal plugins
     load_plugins(sima, 'internal')
-
     #  Loading contrib plugins
     load_plugins(sima, 'contrib')
     logger.info('plugins loaded, prioriy: %s', ' > '.join(map(str, sima.plugins)))