Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Explicitly close all connections instead of relying on GC

Browse Source
This commit is contained in:
Kovid Goyal 2014-11-11 07:08:45 +05:30
parent 46fe62e45f
commit cce5a0d894
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/calibre/utils/ipc/pool.py
View File

@ -224,6 +224,8 @@ class Pool(Thread):
return self.terminal_failure is not None return self.terminal_failure is not None
def terminal_error(self): def terminal_error(self):
if self.shutting_down:
return
for worker, job in self.busy_workers.iteritems(): for worker, job in self.busy_workers.iteritems():
self.results.put(WorkerResult(job.id, Result(None, None, None), True, worker)) self.results.put(WorkerResult(job.id, Result(None, None, None), True, worker))
self.tracker.task_done() self.tracker.task_done()
@ -234,6 +236,7 @@ class Pool(Thread):
self.shutdown() self.shutdown()
def shutdown_workers(self, wait_time=0.1): def shutdown_workers(self, wait_time=0.1):
self.worker_data = self.common_data = None
for worker in self.busy_workers: for worker in self.busy_workers:
if worker.process.poll() is None: if worker.process.poll() is None:
try: try:
@ -257,6 +260,11 @@ class Pool(Thread):
reaper.daemon = True reaper.daemon = True
reaper.start() reaper.start()
reaper.join(wait_time) reaper.join(wait_time)
for w in self.available_workers + list(self.busy_workers):
try:
w.conn.close()
except Exception:
pass
for w in workers: for w in workers:
if w.poll() is None: if w.poll() is None:
try: try: