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

Log failure to shutdown workers in pool cleanly

Browse Source
This commit is contained in:
Kovid Goyal 2015-06-03 18:41:27 +05:30
parent 73caed9c54
commit 35dec94173
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/calibre/srv/loop.py
View File

@ -566,6 +566,8 @@ class ServerLoop(object):
wait_till = time.time() + self.opts.shutdown_timeout wait_till = time.time() + self.opts.shutdown_timeout
for pool in (self.plugin_pool, self.pool): for pool in (self.plugin_pool, self.pool):
pool.stop(wait_till) pool.stop(wait_till)
if pool.workers:
self.log.warn('Failed to shutdown %d workers in %s cleanly' % (len(pool.workers), pool.__class__.__name__))
class EchoLine(Connection): # {{{ class EchoLine(Connection): # {{{

1
src/calibre/srv/tests/loop.py
View File

@ -89,6 +89,7 @@ class LoopTest(BaseTest):
with self.assertRaises(socket.timeout): with self.assertRaises(socket.timeout):
conn.getresponse() conn.getresponse()
self.ae(pool.busy, 1) self.ae(pool.busy, 1)
server.loop.log.filter_level = server.loop.log.ERROR
server.loop.stop() server.loop.stop()
server.join() server.join()
self.ae(1, sum(int(w.is_alive()) for w in pool.workers)) self.ae(1, sum(int(w.is_alive()) for w in pool.workers))