X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=sima%2Flaunch.py;h=784d23784d480fd3323a210aa44ca93974b99641;hb=a260ebea93f23d72aa6e0178744b0f64c469b7ba;hp=1757d2bcee717d1780d272c8e24fed977ee0dedd;hpb=3636f8f37183e1b1f1c581b4edfff1b1abd70462;p=mpd-sima.git diff --git a/sima/launch.py b/sima/launch.py index 1757d2b..784d237 100644 --- a/sima/launch.py +++ b/sima/launch.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (c) 2013, 2014, 2015, 2020,2021 kaliko +# Copyright (c) 2013, 2014, 2015, 2020, 2021 kaliko # # This file is part of sima # @@ -51,19 +51,19 @@ def load_plugins(sima, source): """Handles internal/external plugins sima: sima.core.Sima instance source: ['internal', 'contrib'] - """ + """# pylint: disable=logging-not-lazy,logging-format-interpolation if not sima.config.get('sima', source): return logger = logging.getLogger('sima') # TODO: Sanity check for "sima.config.get('sima', source)" ? for plugin in sima.config.get('sima', source).split(','): plugin = plugin.strip(' \n') - module = 'sima.plugins.{0}.{1}'.format(source, plugin.lower()) + module = f'sima.plugins.{source}.{plugin.lower()}' try: mod_obj = sima_import(module, fromlist=[plugin]) except ImportError as err: - logger.error('Failed to load "{}" plugin\'s module: '.format(plugin) + - '{0} ({1})'.format(module, err)) + logger.error(f'Failed to load "{plugin}" plugin\'s module: ' + + f'{module} ({err})') sima.shutdown() sys.exit(1) try: @@ -114,7 +114,7 @@ def start(sopt, restart=False): if cmd == "generate-config": config.write(sys.stdout, space_around_delimiters=True) sys.exit(0) - logger.info('Running "%s" and exit' % cmd) + logger.info('Running "%s" and exit', cmd) if cmd == "config-test": logger.info('Config location: "%s"', cfg_mgmt.conf_file) from .utils.configtest import config_test @@ -148,7 +148,8 @@ def start(sopt, restart=False): for cplgn in core_plugins: logger.debug('Register core %(name)s (%(doc)s)', cplgn.info()) sima.register_core_plugin(cplgn) - logger.debug('core loaded, prioriy: %s', ' > '.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') @@ -188,6 +189,7 @@ def run(sopt, restart=False): except Exception: # Unhandled exception exception_log() + # Script starts here def main(): """Entry point"""