Wait for kernel to be connected to send shutdown_request

jupyter · Nov 6, 2018 · 76b9044 · 76b9044
1 parent f6b0674
commit 76b9044
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/notebook/services/kernels/kernelmanager.py b/notebook/services/kernels/kernelmanager.py
@@ -96,9 +96,10 @@ def _msg_received(self, msg, channel):
     def shutdown(self, now=False):
         self.restarter.stop()
 
-        if now:
+        if now or (self.client is None):
             self.manager.kill()
         else:
+            yield self.client_connected
             yield self.client.shutdown_or_terminate()
 
         self._close_client()