X-Git-Url: https://git.kaliko.me/?a=blobdiff_plain;f=launch;h=9d12fda1ebdc9f014ca34fbf2ae1bcb0c4345828;hb=0236b2bf31b893ab0b53374c0d3a0bc0ab9deda3;hp=3e88542efee5b6e7d4049479c5940e7800816129;hpb=39becab4a5cf591b1833e875c06793d97ac78659;p=mpd-sima.git

diff --git a/launch b/launch
index 3e88542..9d12fda 100755
--- a/launch
+++ b/launch
@@ -3,7 +3,7 @@
 """Sima
 """
 
-# standart library import
+# standard library import
 import logging
 import sys
 
@@ -20,7 +20,7 @@ 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
@@ -52,13 +52,9 @@ def load_plugins(sima, source):
         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__,
-                 'prog': 'sima'})
-    # 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)
@@ -86,7 +82,7 @@ def main():
     logger.info('Starting...')
     sima = core.Sima(config)
 
-    # core plugins
+    # required core plugins
     sima.register_plugin(History)
     sima.register_plugin(MpdOptions)
 
@@ -95,30 +91,46 @@ def main():
 
     #  Loading contrib plugins
     load_plugins(sima, 'contrib')
-
     # Run as a daemon
     if config.getboolean('daemon', 'daemon'):
-        sima.start()
+        if restart:
+            sima.run()
+        else:
+            logger.info('Daemonize process...')
+            sima.start()
 
+    logger.error('starting')
     try:
         sima.foreground()
     except KeyboardInterrupt:
         logger.info('Caught KeyboardInterrupt, stopping')
-        #sima.shutdown()
+        sys.exit(0)
 
 
-def run():
-    """Catching broad exception
+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__':
-    run()
+    main()
 
 # VIM MODLINE
 # vim: ai ts=4 sw=4 sts=4 expandtab