github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-10-22 00:09:14 +00:00
Code Issues Projects Releases Wiki Activity

修复log kill和在线查看命令统计

Browse Source
This commit is contained in:
ibuler
2015-11-04 15:11:14 +08:00
parent e4ccb1c43f
commit a0a7623743
4 changed files with 43 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jlog/urls.py
View File

@@ -6,8 +6,6 @@ urlpatterns = patterns('',
url(r'^$', log_list),
url(r'^log_list/(\w+)/$', log_list),
url(r'^history/$', log_history),
# url(r'^log_kill/', log_kill),
url(r'^log_kill/', log_kill),
url(r'^record/$', log_record),
url(r'^search/$', log_search),
url(r'^monitor/$', log_monitor),
)

62
jlog/views.py
View File

@@ -11,10 +11,12 @@ from models import Log
from jumpserver.settings import web_socket_host
web_socket_host = 'ws://j:8080/monitor'
def log_list(request, offset):
""" 显示日志 """
header_title, path1, path2 = u'查看日志', u'查看日志', u'在线用户'
# posts = get_user_log(get_user_info(request, offset))
date_seven_day = request.GET.get('start', '')
date_now_str = request.GET.get('end', '')
username_list = request.GET.getlist('username', [])
@@ -29,22 +31,18 @@ def log_list(request, offset):
ip_all = set([log.host for log in Log.objects.all()])
if date_seven_day and date_now_str:
datetime_start = datetime.datetime.strptime(date_seven_day, '%m/%d/%Y %H:%M:%S')
datetime_end = datetime.datetime.strptime(date_now_str, '%m/%d/%Y %H:%M:%S')
datetime_start = datetime.datetime.strptime(date_seven_day + ' 00:00:01', '%m/%d/%Y %H:%M:%S')
datetime_end = datetime.datetime.strptime(date_now_str + ' 23:59:59', '%m/%d/%Y %H:%M:%S')
posts = posts.filter(start_time__gte=datetime_start).filter(start_time__lte=datetime_end)
if username_list:
print username_list
posts = posts.filter(user__in=username_list)
if host_list:
posts = posts.filter(host__in=host_list)
print posts
if cmd:
log_id_list = set([log.log_id for log in TtyLog.objects.filter(cmd__contains=cmd)])
print [post.id for post in posts]
posts = posts.filter(id__in=log_id_list)
print posts
else:
date_now = datetime.datetime.now()
date_now_str = date_now.strftime('%m/%d/%Y')
@@ -52,27 +50,24 @@ def log_list(request, offset):
contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
web_socket_uri = web_socket_host
return render_to_response('jlog/log_%s.html' % offset, locals(), context_instance=RequestContext(request))
#
# def log_kill(request):
# """ 杀掉connect进程 """
# pid = request.GET.get('id', '')
# log = Log.objects.filter(pid=pid)
# if log:
# log = log[0]
# dept_name = log.dept_name
# deptname = get_session_user_info(request)[4]
# if is_group_admin(request) and dept_name != deptname:
# return httperror(request, u'Kill失败, 您无权操作!')
# try:
# os.kill(int(pid), 9)
# except OSError:
# pass
# Log.objects.filter(pid=pid).update(is_finished=1, end_time=datetime.datetime.now())
# return render_to_response('jlog/log_offline.html', locals(), context_instance=RequestContext(request))
# else:
# return HttpResponseNotFound(u'没有此进程!')
def log_kill(request):
""" 杀掉connect进程 """
pid = request.GET.get('id', '')
log = Log.objects.filter(pid=pid)
if log:
log = log[0]
try:
os.kill(int(pid), 9)
except OSError:
pass
Log.objects.filter(pid=pid).update(is_finished=1, end_time=datetime.datetime.now())
return render_to_response('jlog/log_offline.html', locals(), context_instance=RequestContext(request))
else:
return HttpResponseNotFound(u'没有此进程!')
def log_history(request):
@@ -106,19 +101,4 @@ def log_record(request):
return HttpResponse('无日志记录, 请查看日志处理脚本是否开启!')
def log_search(request):
print request.GET
return render_to_response('jlog/log_filter.html', locals())
def log_monitor(request):
return my_render('jlog/log_monitor.html', locals(), request)
# def log_search(request):
# """ 日志搜索 """
# offset = request.GET.get('env', '')
# keyword = request.GET.get('keyword', '')
# posts = get_user_log(get_user_info(request, offset))
# contact_list, p, contacts, page_range, current_page, show_first, show_end = pages(posts, request)
# return render_to_response('jlog/log_search.html', locals(), context_instance=RequestContext(request))