X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=launch;h=9d12fda1ebdc9f014ca34fbf2ae1bcb0c4345828;hb=0236b2bf31b893ab0b53374c0d3a0bc0ab9deda3;hp=192ec399a486bf492263087bee3a25cc10589edb;hpb=611f98994247324793027cae02d77e5a8efd0f42;p=mpd-sima.git

diff --git a/launch b/launch
index 192ec39..9d12fda 100755
--- a/launch
+++ b/launch
@@ -3,12 +3,12 @@
 """Sima
 """
 
-# standart library import
+# standard library import
 import logging
 import sys
 
 from importlib import __import__
-from os.path import isfile, basename
+from os.path import isfile
 ##
 
 # third parties components
@@ -16,28 +16,28 @@ from os.path import isfile, basename
 
 # local import
 from sima import core
-from sima.plugins.crop import Crop
-from sima.plugins.addhist import History
 from sima.lib.logger import set_logger
 from sima.lib.simadb import SimaDB
 from sima.utils.config import ConfMan
 from sima.utils.startopt import StartOpt
-from sima.utils.utils import exception_log
+from sima.utils.utils import exception_log, SigHup
+ # core plugins
+from sima.plugins.core.history import History
+from sima.plugins.core.mpdoptions import MpdOptions
 ##
 
-# official plugins to start
-PLUGINS = (Crop, History)
 
-
-def load_contrib_plugins(sima):
-    """Handles contrib/external plugins
+def load_plugins(sima, source):
+    """Handles internal/external plugins
+        sima:   sima.core.Sima instance
+        source: ['internal', 'contrib']
     """
-    if not sima.config.has_option('sima', 'plugins'):
+    if not sima.config.get('sima', source ):
         return
     logger = logging.getLogger('sima')
-    for plugin in sima.config.get('sima','plugins').split(','):
+    for plugin in sima.config.get('sima', source).split(','):
         plugin = plugin.strip(' \n')
-        module = 'sima.plugins.contrib.{}'.format(plugin.lower())
+        module = 'sima.plugins.{0}.{1}'.format(source, plugin.lower())
         try:
             mod_obj = __import__(module, fromlist=[plugin])
         except ImportError as err:
@@ -48,65 +48,89 @@ def load_contrib_plugins(sima):
         except AttributeError as err:
             logger.error('Failed to load plugin {0} ({1})'.format(plugin, err))
             sima.shutdown()
-        logger.info('Loading contrib plugin: {name} ({doc})'.format(**plugin_obj.info()))
+        logger.info('Loading {0} plugin: {name} ({doc})'.format(source, **plugin_obj.info()))
         sima.register_plugin(plugin_obj)
 
 
-def main():
-    """Entry point, deal w/ CLI and starts application
+def start(sopt, restart=False):
+    """starts application
     """
-    info = dict({'version': core.__version__,})
-    # StartOpt gathers options from command line call (in StartOpt().options)
-    sopt = StartOpt(info)
     # set logger
     verbosity = sopt.options.get('verbosity', 'warning')
+    logfile = sopt.options.get('logfile', None)
     cli_loglevel = getattr(logging, verbosity.upper())
-    set_logger(level=verbosity)
+    set_logger(level=verbosity, logfile=logfile)
     logger = logging.getLogger('sima')
     logger.setLevel(cli_loglevel)
     # loads configuration
-    conf_manager = ConfMan(logger, sopt.options)
-    config = conf_manager.config
+    config = ConfMan(logger, sopt.options).config
     logger.setLevel(getattr(logging,
                     config.get('log', 'verbosity').upper()))  # pylint: disable=E1103
 
     logger.debug('Command line say: {0}'.format(sopt.options))
-
     # Create Database
+    db_file = config.get('sima', 'db_file')
     if (sopt.options.get('create_db', None)
-       or not isfile(conf_manager.db_file)):
-        logger.info('Creating database in "{}"'.format(conf_manager.db_file))
-        open(conf_manager.db_file, 'a').close()
-        SimaDB(db_path=conf_manager.db_file).create_db()
+       or not isfile(db_file)):
+        logger.info('Creating database in "{}"'.format(db_file))
+        open(db_file, 'a').close()
+        SimaDB(db_path=db_file).create_db()
         if sopt.options.get('create_db', None):
             logger.info('Done, bye...')
             sys.exit(0)
 
     logger.info('Starting...')
-    sima = core.Sima(config, conf_manager.db_file)
+    sima = core.Sima(config)
+
+    # required core plugins
+    sima.register_plugin(History)
+    sima.register_plugin(MpdOptions)
 
     #  Loading internal plugins
-    for plugin in PLUGINS:
-        logger.info('Loading internal plugin: {name} ({doc})'.format(**plugin.info()))
-        sima.register_plugin(plugin)
+    load_plugins(sima, 'internal')
 
     #  Loading contrib plugins
-    load_contrib_plugins(sima)
+    load_plugins(sima, 'contrib')
+    # Run as a daemon
+    if config.getboolean('daemon', 'daemon'):
+        if restart:
+            sima.run()
+        else:
+            logger.info('Daemonize process...')
+            sima.start()
+
+    logger.error('starting')
     try:
-        sima.run()
+        sima.foreground()
     except KeyboardInterrupt:
         logger.info('Caught KeyboardInterrupt, stopping')
-        sima.shutdown()
+        sys.exit(0)
 
 
-# Script starts here
-if __name__ == '__main__':
+def run(sopt, restart=False):
+    """
+    Handles SigHup exception
+    Catches Unhandled exception
+    """
     # pylint: disable=broad-except
     try:
-        main()
-    except Exception:
+        start(sopt, restart)
+    except SigHup as err:  # SigHup inherit from Exception
+        run(sopt, True)
+    except Exception:  # Unhandled exception
         exception_log()
 
+# Script starts here
+def main():
+    info = dict({'version': core.__version__,
+                 'prog': 'sima'})
+    # StartOpt gathers options from command line call (in StartOpt().options)
+    sopt = StartOpt(info)
+    run(sopt)
+
+
+if __name__ == '__main__':
+    main()
 
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab