more context cleanup

jupyter · Apr 24, 2022 · 523ba88 · 523ba88
1 parent a50d602
commit 523ba88
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/jupyter_client/client.py b/jupyter_client/client.py
@@ -117,10 +117,15 @@ def _context_default(self) -> zmq.asyncio.Context:
     allow_stdin: bool = True
 
     def __del__(self):
+        """Handle garbage collection.  Destroy context if applicable."""
         if self._created_context and self.context and not self.context.closed:
-            if self.log:
-                self.log.debug("Destroying zmq context for %s", self)
-            self.context.destroy()
+            if self.channels_running:
+                if self.log:
+                    self.log.warning("Could not destroy zmq context for %s", self)
+            else:
+                if self.log:
+                    self.log.debug("Destroying zmq context for %s", self)
+                self.context.destroy()
         try:
             super_del = super().__del__
         except AttributeError:

diff --git a/jupyter_client/multikernelmanager.py b/jupyter_client/multikernelmanager.py
@@ -116,6 +116,7 @@ def _context_default(self) -> zmq.Context:
     _kernels = Dict()
 
     def __del__(self):
+        """Handle garbage collection.  Destroy context if applicable."""
         if self._created_context and self.context and not self.context.closed:
             if self.log:
                 self.log.debug("Destroying zmq context for %s", self)