tyler.durden/powerline
1
0
Fork 0
mirror of https://github.com/powerline/powerline.git synced 2025-07-06 13:34:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add timeout to thread join calls to avoid deadlocks

Browse Source
This commit is contained in:
Kim Silkebækken 2013-04-05 15:42:56 +02:00
parent dc1e646308
commit 17065b4c7e
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
powerline/__init__.py
View File

@ -412,7 +412,8 @@ class Powerline(object):
''' '''
self.shutdown_event.set() self.shutdown_event.set()
if self.use_daemon_threads and self.is_alive(): if self.use_daemon_threads and self.is_alive():
self.thread.join() # Give the worker thread a chance to shutdown, but don't block for too long
self.thread.join(.01)
self.renderer.shutdown() self.renderer.shutdown()
self.watcher.unsubscribe() self.watcher.unsubscribe()

3
powerline/lib/threaded.py
View File

@ -77,7 +77,8 @@ class ThreadedSegment(object):
def shutdown(self): def shutdown(self):
self.shutdown_event.set() self.shutdown_event.set()
if self.daemon and self.is_alive(): if self.daemon and self.is_alive():
self.thread.join() # Give the worker thread a chance to shutdown, but don't block for too long
self.thread.join(.01)
def set_interval(self, interval=None): def set_interval(self, interval=None):
# Allowing “interval” keyword in configuration. # Allowing “interval” keyword in configuration.