From a280214f8c3b722cb082c7265448ea2d92eefb46 Mon Sep 17 00:00:00 2001
From: Richard Oudkerk <shibturn@gmail.com>
Date: Fri, 15 Jun 2012 20:08:29 +0100
Subject: Increase timeout used when waiting for manager to shutdown cleanly
 before resorting to terminate()

---
 Lib/multiprocessing/managers.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Lib/multiprocessing/managers.py')

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'):
-- 
cgit v1.2.1