github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-06-21 20:47:31 +00:00
Code Issues Projects Releases Wiki Activity

resolve kill process bug

Browse Source
This commit is contained in:
ibuler 2015-06-09 09:49:31 +08:00
parent 5bae8245bd
commit 95cc2830c8
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
jlog/views.py
View File

@ -76,7 +76,10 @@ def log_kill(request):
deptname = get_session_user_info(request)[4] deptname = get_session_user_info(request)[4]
if is_group_admin(request) and dept_name != deptname: if is_group_admin(request) and dept_name != deptname:
return httperror(request, u'Kill失败, 您无权操作!') return httperror(request, u'Kill失败, 您无权操作!')
try:
os.kill(int(pid), 9) os.kill(int(pid), 9)
except OSError:
pass
Log.objects.filter(pid=pid).update(is_finished=1, end_time=datetime.datetime.now()) 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)) return render_to_response('jlog/log_offline.html', locals(), context_instance=RequestContext(request))
else: else: