Increase timeout used when waiting for manager to shutdown cleanly

before resorting to terminate()
This commit is contained in:
Richard Oudkerk 2012-06-15 20:08:29 +01:00
parent 0f52346e76
commit 3049f1243e
2 changed files with 6 additions and 1 deletions

View file

@ -582,7 +582,7 @@ class BaseManager(object):
except Exception:
pass
process.join(timeout=0.2)
process.join(timeout=1.0)
if process.is_alive():
util.info('manager still alive')
if hasattr(process, 'terminate'):