github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-21 15:58:52 +00:00
Code Issues Projects Releases Wiki Activity

修复环境变量大小写，修改terminal类

Browse Source
This commit is contained in:
ibuler
2015-11-13 21:15:41 +08:00
parent 4ae36d319c
commit 20970db404
6 changed files with 53 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jlog/views.py
View File

@@ -8,7 +8,7 @@ from django.http import HttpResponseNotFound
from jlog.log_api import renderTemplate
from models import Log
from jumpserver.settings import web_socket_host
from jumpserver.settings import WEB_SOCKET_HOST
@require_role('admin')
@@ -48,8 +48,8 @@ def log_list(request, offset):
contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
web_monitor_uri = 'ws://%s/monitor' % web_socket_host
web_kill_uri = 'http://%s/kill' % web_socket_host
web_monitor_uri = 'ws://%s/monitor' % WEB_SOCKET_HOST
web_kill_uri = 'http://%s/kill' % WEB_SOCKET_HOST
return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))
@@ -108,6 +108,6 @@ def web_terminal(request):
token = request.COOKIES.get('sessionid')
username = request.user.username
asset_name = '127.0.0.1'
web_terminal_uri = 'ws://%s/terminal?username=%s&asset_name=%s&token=%s' % (web_socket_host, username, asset_name, token)
web_terminal_uri = 'ws://%s/terminal?username=%s&asset_name=%s&token=%s' % (WEB_SOCKET_HOST, username, asset_name, token)
return render_to_response('jlog/web_terminal.html', locals())