From 0398193d34d2f17f544b296d32033613284671b1 Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Sun, 24 Oct 2010 20:07:27 +0200 Subject: [PATCH] Make all threads daemon threads per default --- mopidy/backends/libspotify/session_manager.py | 4 ---- mopidy/frontends/lastfm.py | 1 - mopidy/frontends/mpd/thread.py | 2 -- mopidy/outputs/gstreamer.py | 3 --- mopidy/utils/process.py | 2 ++ 5 files changed, 2 insertions(+), 10 deletions(-) diff --git a/mopidy/backends/libspotify/session_manager.py b/mopidy/backends/libspotify/session_manager.py index 61780166..7f541236 100644 --- a/mopidy/backends/libspotify/session_manager.py +++ b/mopidy/backends/libspotify/session_manager.py @@ -21,10 +21,6 @@ class LibspotifySessionManager(SpotifySessionManager, BaseThread): SpotifySessionManager.__init__(self, username, password) BaseThread.__init__(self, core_queue) self.name = 'LibspotifySMThread' - # Run as a daemon thread, so Mopidy won't wait for this thread to exit - # before Mopidy exits. - self.daemon = True - self.core_queue = core_queue self.output = output self.connected = threading.Event() self.session = None diff --git a/mopidy/frontends/lastfm.py b/mopidy/frontends/lastfm.py index a227aa0e..e91dd272 100644 --- a/mopidy/frontends/lastfm.py +++ b/mopidy/frontends/lastfm.py @@ -61,7 +61,6 @@ class LastfmFrontendThread(BaseThread): def __init__(self, core_queue, connection): super(LastfmFrontendThread, self).__init__(core_queue) self.name = u'LastfmFrontendThread' - self.daemon = True self.connection = connection self.lastfm = None self.scrobbler = None diff --git a/mopidy/frontends/mpd/thread.py b/mopidy/frontends/mpd/thread.py index e8f0be70..0ad5ee68 100644 --- a/mopidy/frontends/mpd/thread.py +++ b/mopidy/frontends/mpd/thread.py @@ -10,8 +10,6 @@ class MpdThread(BaseThread): def __init__(self, core_queue): super(MpdThread, self).__init__(core_queue) self.name = u'MpdThread' - self.daemon = True - self.core_queue = core_queue def run_inside_try(self): logger.debug(u'Starting MPD server thread') diff --git a/mopidy/outputs/gstreamer.py b/mopidy/outputs/gstreamer.py index 513f5f82..3714fed6 100644 --- a/mopidy/outputs/gstreamer.py +++ b/mopidy/outputs/gstreamer.py @@ -94,7 +94,6 @@ class GStreamerMessagesThread(BaseThread): def __init__(self, core_queue): super(GStreamerMessagesThread, self).__init__(core_queue) self.name = u'GStreamerMessagesThread' - self.daemon = True def run_inside_try(self): gobject.MainLoop().run() @@ -115,8 +114,6 @@ class GStreamerPlayerThread(BaseThread): def __init__(self, core_queue, output_queue): super(GStreamerPlayerThread, self).__init__(core_queue) self.name = u'GStreamerPlayerThread' - self.daemon = True - self.core_queue = core_queue self.output_queue = output_queue self.gst_pipeline = None diff --git a/mopidy/utils/process.py b/mopidy/utils/process.py index 9af6fbf5..7855d69c 100644 --- a/mopidy/utils/process.py +++ b/mopidy/utils/process.py @@ -56,6 +56,8 @@ class BaseThread(multiprocessing.dummy.Process): def __init__(self, core_queue): super(BaseThread, self).__init__() self.core_queue = core_queue + # No thread should block process from exiting + self.daemon = True def run(self): logger.debug(u'%s: Starting thread', self.name)