Skip to content

J
jumpserver
Commit 4f75f76d authored by liuzheng712's avatar liuzheng712
Browse files
Options

fix: web socket url update

parent 92e9f988
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
jumpserver/views.py
View file @ 4f75f76d
...@@ -356,7 +356,7 @@ def web_terminal(request): ...@@ -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())
run_websocket.py
View file @ 4f75f76d
...@@ -439,8 +439,8 @@ def main(): ...@@ -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,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment