mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-24 12:05:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Feedback: remove socket on stop.

Browse Source
This commit is contained in:
Kris Wilson 2020-05-13 02:07:00 -07:00
parent 5aa6e0dfd5
commit dcc8874daa
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
notebook/notebookapp.py
View File

@ -517,6 +517,13 @@ class NbserverStopApp(JupyterApp):
if not self.shutdown_server(server): if not self.shutdown_server(server):
sys.exit("Could not stop server on %s" % target_endpoint) sys.exit("Could not stop server on %s" % target_endpoint)
@staticmethod
def _maybe_remove_unix_socket(socket_path):
try:
os.unlink(socket_path)
except (OSError, IOError):
pass
def start(self): def start(self):
servers = list(list_running_servers(self.runtime_dir)) servers = list(list_running_servers(self.runtime_dir))
if not servers: if not servers:
@ -527,6 +534,8 @@ class NbserverStopApp(JupyterApp):
sock = server.get('sock', None) sock = server.get('sock', None)
if sock and sock == self.sock: if sock and sock == self.sock:
self._shutdown_or_exit(sock, server) self._shutdown_or_exit(sock, server)
# Attempt to remove the UNIX socket after stopping.
self._maybe_remove_unix_socket(sock)
return return
elif self.port: elif self.port:
port = server.get('port', None) port = server.get('port', None)