X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=03baa4fa5e9af85b68b9b66a91152aa17aa8e9b6;hb=194de8ab2773bd8e456590e3876a0aca1fe4d564;hp=e1bd7449143a852d0eae500a2e18553b39e2d702;hpb=78a694ddcd2a6ecc8b2b1fd3c74ee2d938707305;p=mpd-sima.git diff --git a/sima/launch.py b/sima/launch.py index e1bd744..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(','): @@ -79,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') @@ -104,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: