andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'feature/split-main-func' into develop

Browse Source
This commit is contained in:
Stein Magnus Jodal 2013-09-16 23:32:46 +02:00
commit f7a4f8e316
1 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mopidy/__main__.py
View File

@ -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)