Catch keyboard interrupts in all core setup methods

2011-06-09 20:04:05 +02:00 · 2011-06-09 20:04:05 +02:00 · ded513faed
commit ded513faed
parent efa38d2449
1 changed files with 8 additions and 8 deletions
--- a/mopidy/core.py
+++ b/mopidy/core.py
@ -28,15 +28,15 @@ from mopidy.utils.settings import list_settings_optparse_callback
 logger = logging.getLogger('mopidy.core')

 def main():
-    options = parse_options()
-    setup_logging(options.verbosity_level, options.save_debug_log)
-    setup_settings(options.interactive)
-    setup_gobject_loop()
-    setup_gstreamer()
-    setup_mixer()
-    setup_backend()
-    setup_frontends()
    try:
+        options = parse_options()
+        setup_logging(options.verbosity_level, options.save_debug_log)
+        setup_settings(options.interactive)
+        setup_gobject_loop()
+        setup_gstreamer()
+        setup_mixer()
+        setup_backend()
+        setup_frontends()
        while ActorRegistry.get_all():
            time.sleep(1)
        logger.info(u'No actors left. Exiting...')