Some cleanup, CLI/bash completion/Doc improvements

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

diff --git a/sima/launch.py b/sima/launch.py
index 2e2d1dd79435cf14710204d1cd0b4da5123fb45b..4cc60e3be17993ad13536be4f5b92275816c9bc2 100644 (file)
--- a/sima/launch.py
+++ b/sima/launch.py
@@ -79,14 +79,13 @@ def load_plugins(sima, source):
 def start(sopt, restart=False):
     """starts application
     """
-    # set logger
-    verbosity = sopt.options.get('verbosity', 'warning')
     # 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')
@@ -99,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)