From dd899bf7aaff7023324f4a7b88a73caf64926b69 2009-10-31 19:14:45
From: Brian Granger <ellisonbg@gmail.com>
Date: 2009-10-31 19:14:45
Subject: [PATCH] Changed the INT then KILL delay to 2 s to be a little more friendly.

---

diff --git a/IPython/kernel/client.py b/IPython/kernel/client.py
index ed432a3..872ec3a 100644
--- a/IPython/kernel/client.py
+++ b/IPython/kernel/client.py
@@ -64,7 +64,8 @@ get_task_client = _client_tub.get_task_client
 MultiEngineClient = get_multiengine_client
 TaskClient = get_task_client
 
-twisted_log = StringIO()
+# This isn't great.  I should probably set this up in the ReactorInThread
+# class below.  But, it does work for now.
 log.startLogging(sys.stdout, setStdout=0)
 
 # Now we start the reactor in a thread
diff --git a/IPython/kernel/launcher.py b/IPython/kernel/launcher.py
index 1eec79a..0e7d536 100644
--- a/IPython/kernel/launcher.py
+++ b/IPython/kernel/launcher.py
@@ -245,7 +245,7 @@ class LocalProcessLauncher(BaseLauncher):
             self.process_transport.signalProcess(sig)
 
     @inlineCallbacks
-    def interrupt_then_kill(self, delay=1.0):
+    def interrupt_then_kill(self, delay=2.0):
         yield self.signal('INT')
         yield sleep_deferred(delay)
         yield self.signal('KILL')