Put terminal handlers under base_url

pull/37/head
Thomas Kluyver 12 years ago
parent cbc70a7de7
commit a907d8f7f4

@ -1,17 +1,19 @@
import os
from terminado import NamedTermManager
from IPython.html.utils import url_path_join as ujoin
from .handlers import TerminalHandler, NewTerminalHandler, TermSocket
from . import api_handlers
def initialize(webapp):
shell = os.environ.get('SHELL', 'sh')
webapp.terminal_manager = NamedTermManager(shell_command=[shell])
base_url = webapp.settings['base_url']
handlers = [
(r"/terminals/new", NewTerminalHandler),
(r"/terminals/(\w+)", TerminalHandler),
(r"/terminals/websocket/(\w+)", TermSocket,
(ujoin(base_url, "/terminals/new"), NewTerminalHandler),
(ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
(ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
{'term_manager': webapp.terminal_manager}),
(r"/api/terminals", api_handlers.TerminalRootHandler),
(r"/api/terminals/(\w+)", api_handlers.TerminalHandler),
(ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
(ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
]
webapp.add_handlers(".*$", handlers)
Loading…
Cancel
Save