diff options
| author | Richard Oudkerk <shibturn@gmail.com> | 2012-06-15 19:08:29 (GMT) |
|---|---|---|
| committer | Richard Oudkerk <shibturn@gmail.com> | 2012-06-15 19:08:29 (GMT) |
| commit | 3049f1243ec85590f64962994f055da66c85a15e (patch) | |
| tree | 5b97ba94f26319cf3f9b0b6b9811d48e9c621503 /Lib/multiprocessing/managers.py | |
| parent | 0f52346e760648a83504b1babd2a530f802eb096 (diff) | |
| download | cpython-3049f1243ec85590f64962994f055da66c85a15e.zip cpython-3049f1243ec85590f64962994f055da66c85a15e.tar.gz cpython-3049f1243ec85590f64962994f055da66c85a15e.tar.bz2 | |
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 cded4f3..f6611af 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'): |