From 2453e6826f93301a0003b869e46d4cb41aeb81b7 Mon Sep 17 00:00:00 2001
From: Stein Magnus Jodal <stein.magnus@jodal.no>
Date: Fri, 10 Jun 2011 14:17:29 +0200
Subject: [PATCH] Add exit_process() function for shutting down Mopidy instead
 of ActorRegistry.stop_all()

---
 mopidy/core.py          |  5 ++---
 mopidy/utils/process.py | 10 ++++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/mopidy/core.py b/mopidy/core.py
index b89a5456..8138f198 100644
--- a/mopidy/core.py
+++ b/mopidy/core.py
@@ -40,11 +40,10 @@ def main():
         setup_mixer()
         setup_backend()
         setup_frontends()
-        while ActorRegistry.get_all():
+        while True:
             time.sleep(1)
-        logger.info(u'No actors left. Exiting...')
     except KeyboardInterrupt:
-        logger.info(u'User interrupt. Exiting...')
+        logger.info(u'Interrupted. Exiting...')
         stop_all_actors()
 
 def parse_options():
diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py
index 2e18280e..c1d1c9f5 100644
--- a/mopidy/utils/process.py
+++ b/mopidy/utils/process.py
@@ -1,5 +1,6 @@
 import logging
 import signal
+import thread
 import threading
 
 import gobject
@@ -12,12 +13,17 @@ from mopidy import SettingsError
 
 logger = logging.getLogger('mopidy.utils.process')
 
+def exit_process():
+    logger.debug(u'Interrupting main...')
+    thread.interrupt_main()
+    logger.debug(u'Interrupted main')
+
 def exit_handler(signum, frame):
     """A :mod:`signal` handler which will exit the program on signal."""
     signals = dict((k, v) for v, k in signal.__dict__.iteritems()
         if v.startswith('SIG') and not v.startswith('SIG_'))
-    logger.info(u'Got %s. Exiting...', signals[signum])
-    stop_all_actors()
+    logger.info(u'Got %s signal', signals[signum])
+    exit_process()
 
 def stop_all_actors():
     num_actors = len(ActorRegistry.get_all())