mirror/notebook
2
0
Fork 0
mirror of https://github.com/jupyter/notebook.git synced 2025-01-18 11:55:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Apply review comments, revert interval validation, bump terminado to 0.8.3

Browse Source
This commit is contained in:
Kevin Bates 2020-05-18 11:11:09 -07:00
parent 2064957a84
commit 84b7b854b6
No known key found for this signature in database
GPG Key ID: ADCCD5840EE5145F
4 changed files with 16 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
notebook/notebookapp.py
View File

@ -1743,7 +1743,7 @@ class NotebookApp(JupyterApp):
try:
from .terminal import initialize
initialize(self.web_app, self.notebook_dir, self.connection_url, self.terminado_settings, self)
initialize(parent=self)
self.web_app.settings['terminals_available'] = True
except ImportError as e:
self.log.warning(_("Terminals not available (error was %s)"), e)

16
notebook/terminal/__init__.py
View File

@ -14,26 +14,26 @@ from .handlers import TerminalHandler, TermSocket
from . import api_handlers
def initialize(webapp, notebook_dir, connection_url, settings, parent):
def initialize(parent):
if os.name == 'nt':
default_shell = 'powershell.exe'
else:
default_shell = which('sh')
shell = settings.get('shell_command',
shell = parent.terminado_settings.get('shell_command',
[os.environ.get('SHELL') or default_shell]
)
# Enable login mode - to automatically source the /etc/profile script
if os.name != 'nt':
shell.append('-l')
terminal_manager = webapp.settings['terminal_manager'] = TerminalManager(
terminal_manager = parent.web_app.settings['terminal_manager'] = TerminalManager(
shell_command=shell,
extra_env={'JUPYTER_SERVER_ROOT': notebook_dir,
'JUPYTER_SERVER_URL': connection_url,
extra_env={'JUPYTER_SERVER_ROOT': parent.notebook_dir,
'JUPYTER_SERVER_URL': parent.connection_url,
},
parent=parent,
)
terminal_manager.log = app_log
base_url = webapp.settings['base_url']
terminal_manager.log = parent.log
base_url = parent.web_app.settings['base_url']
handlers = [
(ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
(ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
@ -41,4 +41,4 @@ def initialize(webapp, notebook_dir, connection_url, settings, parent):
(ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
(ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
]
webapp.add_handlers(".*$", handlers)
parent.web_app.add_handlers(".*$", handlers)

17
notebook/terminal/terminalmanager.py
View File

@ -14,11 +14,11 @@ from terminado import NamedTermManager
from tornado import web
from tornado.ioloop import IOLoop, PeriodicCallback
from traitlets import Integer, validate
from traitlets.config import Configurable
from traitlets.config import LoggingConfigurable
from ..prometheus.metrics import TERMINAL_CURRENTLY_RUNNING_TOTAL
class TerminalManager(Configurable, NamedTermManager):
class TerminalManager(LoggingConfigurable, NamedTermManager):
""" """
_culler_callback = None
@ -35,15 +35,6 @@ class TerminalManager(Configurable, NamedTermManager):
help="""The interval (in seconds) on which to check for terminals exceeding the inactive timeout value."""
)
@validate('cull_interval')
def _cull_interval_validate(self, proposal):
value = proposal['value']
if value <= 0:
warnings.warn("Invalid value for 'cull_interval' detected ({}) - using default value ({}).".
format(value, self.cull_interval_default))
value = self.cull_interval_default
return value
# -------------------------------------------------------------------------
# Methods for managing terminals
# -------------------------------------------------------------------------
@ -118,6 +109,10 @@ class TerminalManager(Configurable, NamedTermManager):
if not self._initialized_culler and self.cull_inactive_timeout > 0:
if self._culler_callback is None:
loop = IOLoop.current()
if self.cull_interval <= 0: # handle case where user set invalid value
self.log.warning("Invalid value for 'cull_interval' detected (%s) - using default value (%s).",
self.cull_interval, self.cull_interval_default)
self.cull_interval = self.cull_interval_default
self._culler_callback = PeriodicCallback(
self._cull_terminals, 1000 * self.cull_interval)
self.log.info("Culling terminals with inactivity > %s seconds at %s second intervals ...",

2
setup.py
View File

@ -110,7 +110,7 @@ for more information.
'nbconvert',
'ipykernel', # bless IPython kernel for now
'Send2Trash',
'terminado>=0.8.1',
'terminado>=0.8.3',
'prometheus_client'
],
extras_require = {