diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-06-15 20:08:29 +0100 |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-06-15 20:08:29 +0100 |
| commit | a280214f8c3b722cb082c7265448ea2d92eefb46 (patch) | |
| tree | 6dd6ba9cf7992ad08f329b1d104eb99a8fc599a8 /Lib/multiprocessing/managers.py | |
| parent | b9214d93027cf361966e0347930ca2e12d6fd81e (diff) | |
| download | cpython-a280214f8c3b722cb082c7265448ea2d92eefb46.tar.gz | |
Increase timeout used when waiting for manager to shutdown cleanly
before resorting to terminate()
Diffstat (limited to 'Lib/multiprocessing/managers.py')
| -rw-r--r-- | Lib/multiprocessing/managers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/multiprocessing/managers.py b/Lib/multiprocessing/managers.py index cded4f39d5..f6611af9a6 100644 --- a/Lib/multiprocessing/managers.py +++ b/Lib/multiprocessing/managers.py @@ -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'): |