From c4dc4985b51470a42255d8b50fc813b99562be53 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 16 Sep 2013 23:27:41 +0200 Subject: [PATCH] main: Don't be verbose on CTRL+C before starting actors --- mopidy/__main__.py | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/mopidy/__main__.py b/mopidy/__main__.py index c426266b..df5f99a4 100644 --- a/mopidy/__main__.py +++ b/mopidy/__main__.py @@ -75,19 +75,17 @@ def main(): log.setup_log_levels(proxied_config) check_old_locations() ext.register_gstreamer_elements(enabled_extensions) + + # Anything that wants to exit after this point must use + # mopidy.utils.process.exit_process as actors have been started. + start(proxied_config, enabled_extensions) except KeyboardInterrupt: - if logging_initialized: - logger.info('Interrupted. Exiting...') - return + pass except Exception as ex: if logging_initialized: logger.exception(ex) raise - # Anything that wants to exit after this point must use - # mopidy.utils.process.exit_process as actors have been started. - start(proxied_config, enabled_extensions) - def start(config, enabled_extensions): loop = gobject.MainLoop() @@ -100,9 +98,6 @@ def start(config, enabled_extensions): except KeyboardInterrupt: logger.info('Interrupted. Exiting...') return - except Exception as ex: - logger.exception(ex) - raise finally: loop.quit() stop_frontends(enabled_extensions)