| commit | 3049f1243ec85590f64962994f055da66c85a15e | [log] [tgz] |
|---|---|---|
| author | Richard Oudkerk <shibturn@gmail.com> | Fri Jun 15 20:08:29 2012 +0100 |
| committer | Richard Oudkerk <shibturn@gmail.com> | Fri Jun 15 20:08:29 2012 +0100 |
| tree | 5b97ba94f26319cf3f9b0b6b9811d48e9c621503 | |
| parent | 0f52346e760648a83504b1babd2a530f802eb096 [diff] [blame] |
Increase timeout used when waiting for manager to shutdown cleanly before resorting to terminate()
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 @@ 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'):