github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: web socket url update

pull/86/head
liuzheng712 2016-02-25 20:05:20 +08:00
parent 92e9f988f3
commit 4f75f76db8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jumpserver/views.py
View File

@ -356,7 +356,7 @@ def web_terminal(request):
if asset: if asset:
print asset print asset
hostname = asset.hostname hostname = asset.hostname
web_terminal_uri = '%s/terminal?id=%s&role=%s' % (WEB_SOCKET_HOST, asset_id, role_name) web_terminal_uri = '%s/ws/terminal?id=%s&role=%s' % (WEB_SOCKET_HOST, asset_id, role_name)
return render_to_response('jlog/web_terminal.html', locals()) return render_to_response('jlog/web_terminal.html', locals())

4
run_websocket.py
View File

@ -439,8 +439,8 @@ def main():
} }
tornado_app = tornado.web.Application( tornado_app = tornado.web.Application(
[ [
# (r'/monitor', MonitorHandler), (r'/monitor', MonitorHandler),
(r'/terminal', WebTerminalHandler), (r'/ws/terminal', WebTerminalHandler),
(r'/kill', WebTerminalKillHandler), (r'/kill', WebTerminalKillHandler),
(r'/exec', ExecHandler), (r'/exec', ExecHandler),
(r"/static/(.*)", tornado.web.StaticFileHandler, (r"/static/(.*)", tornado.web.StaticFileHandler,