Now use "var-dir" as option name

[mpd-sima.git] / sima / launch.py

diff --git a/sima/launch.py b/sima/launch.py
index c2dad9e823df571361414e6a2e3bd7b9c490266c..2f3149187f0b93f68cc15da198fe78acbe79494a 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -61,7 +61,7 @@ def load_plugins(sima, source):
         try:
             mod_obj = __import__(module, fromlist=[plugin])
         except ImportError as err:
-            logger.error('Failed to load plugin\'s module: ' +
+            logger.error('Failed to load "{}" plugin\'s module: '.format(plugin) +
                          '{0} ({1})'.format(module, err))
             sima.shutdown()
             sys.exit(1)
@@ -79,16 +79,13 @@ def load_plugins(sima, source):
 def start(sopt, restart=False):
     """starts application
     """
-    # set logger
-    verbosity = sopt.options.get('verbosity', 'warning')
-    logfile = sopt.options.get('logfile', None)
-    set_logger(verbosity, logfile)
     # loads configuration
     config = ConfMan(sopt.options).config
-    logfile = config.get('log', 'logfile')
+    # set logger
+    logger = logging.getLogger('sima')
+    logfile = config.get('log', 'logfile', fallback=None)
     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')
@@ -101,6 +98,10 @@ def start(sopt, restart=False):
             logger.info('Done, bye...')
             sys.exit(0)
 
+    if sopt.options.get('generate_config'):
+        config.write(sys.stdout, space_around_delimiters=True)
+        sys.exit(0)
+
     logger.info('Starting...')
     sima = core.Sima(config)