linspector/linspector-old
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

removed deamon in TaskExecutor Thread and stopped manually according to "shutdown_wait" in core

Browse source
This commit is contained in:
RafTim 2013-11-09 02:42:51 +01:00
commit e0bd6ad0ea
2 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
bin/linspector
View file

@ -158,13 +158,16 @@ def main():
logger.debug("shutting down scheduler") logger.debug("shutting down scheduler")
shutdown_wait = True shutdown_wait = True
if "shutdown_wait" in core: if "shutdown_wait" in core:
shutdown_wait = core["shutdown_wait"] shutdown_wait = core["shutdown_wait"]
scheduler.shutdown(wait=shutdown_wait) scheduler.shutdown(wait=shutdown_wait)
logging.shutdown() logging.shutdown()
if shutdown_wait:
TaskExecutor.Instance().stop()
else:
TaskExecutor.Instance().stop_immediately()
if __name__ == "__main__": if __name__ == "__main__":

9
linspector/tasks/task.py
View file

@ -73,14 +73,13 @@ class TaskExecutor(object):
self.event = Event() self.event = Event()
self.taskInfos = [] self.taskInfos = []
task_thread = Thread(target=self._run_worker_thread) task_thread = Thread(target=self._run_worker_thread)
task_thread.setDaemon(True)
self._instantEnd = False self._instantEnd = False
self._running = True self._running = True
task_thread.start() task_thread.start()
def _run_worker_thread(self): def _run_worker_thread(self):
while self.is_running() or not self.instand_end(): while self.is_running() or not self.is_instant_end():
if len(self.taskInfos) == 0: if len(self.taskInfos) == 0:
self.event.clear() self.event.clear()
self.event.wait() self.event.wait()
@ -95,7 +94,7 @@ class TaskExecutor(object):
except Exception, e: except Exception, e:
logger.error("Error " + str(e)) logger.error("Error " + str(e))
def is_instand_end(self): def is_instant_end(self):
return self._instantEnd return self._instantEnd
def is_running(self): def is_running(self):
@ -103,10 +102,12 @@ class TaskExecutor(object):
def stop(self): def stop(self):
self._running = False self._running = False
self.event.set()
def stop_immediately(self): def stop_immediately(self):
self.stop() self._running = False
self._instantEnd = True self._instantEnd = True
self.event.set()
def schedule_task(self, msg, task): def schedule_task(self, msg, task):
self.taskInfos.append((msg, task)) self.taskInfos.append((msg, task))