##// END OF EJS Templates
hook up terminado logger
Min RK -
Show More
@@ -1,18 +1,20 b''
1 import os
1 import os
2 from terminado import NamedTermManager
2 from terminado import NamedTermManager
3 from tornado.log import app_log
3 from IPython.html.utils import url_path_join as ujoin
4 from IPython.html.utils import url_path_join as ujoin
4 from .handlers import TerminalHandler, TermSocket
5 from .handlers import TerminalHandler, TermSocket
5 from . import api_handlers
6 from . import api_handlers
6
7
7 def initialize(webapp):
8 def initialize(webapp):
8 shell = os.environ.get('SHELL', 'sh')
9 shell = os.environ.get('SHELL', 'sh')
9 terminal_manager = webapp.settings['terminal_manager'] = NamedTermManager(shell_command=[shell])
10 terminal_manager = webapp.settings['terminal_manager'] = NamedTermManager(shell_command=[shell])
11 terminal_manager.log = app_log
10 base_url = webapp.settings['base_url']
12 base_url = webapp.settings['base_url']
11 handlers = [
13 handlers = [
12 (ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
14 (ujoin(base_url, r"/terminals/(\w+)"), TerminalHandler),
13 (ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
15 (ujoin(base_url, r"/terminals/websocket/(\w+)"), TermSocket,
14 {'term_manager': terminal_manager}),
16 {'term_manager': terminal_manager}),
15 (ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
17 (ujoin(base_url, r"/api/terminals"), api_handlers.TerminalRootHandler),
16 (ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
18 (ujoin(base_url, r"/api/terminals/(\w+)"), api_handlers.TerminalHandler),
17 ]
19 ]
18 webapp.add_handlers(".*$", handlers) No newline at end of file
20 webapp.add_handlers(".*$", handlers)
General Comments 0
You need to be logged in to leave comments. Login now