From c18290c66753fb16e7c9dd401f190fddb06a9a0d Mon Sep 17 00:00:00 2001
From: ibuler <ibuler@qq.com>
Date: Tue, 4 Nov 2014 21:46:19 +0800
Subject: [PATCH] kill session

---
 webroot/AutoSa/AutoSa/urls.py         |  1 +
 webroot/AutoSa/AutoSa/views.py        | 11 +++++++++++
 webroot/AutoSa/templates/base.html    |  2 --
 webroot/AutoSa/templates/logView.html |  2 +-
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/webroot/AutoSa/AutoSa/urls.py b/webroot/AutoSa/AutoSa/urls.py
index 6bf1ea5a3..d0bcec57d 100644
--- a/webroot/AutoSa/AutoSa/urls.py
+++ b/webroot/AutoSa/AutoSa/urls.py
@@ -33,4 +33,5 @@ urlpatterns = patterns('',
     (r'^downFile/$', views.downFile),
     (r'^logView/$', views.logView),
     (r'^logHistory/$', views.logHistory),
+    (r'^killSession/$', views.killSession),
 )
diff --git a/webroot/AutoSa/AutoSa/views.py b/webroot/AutoSa/AutoSa/views.py
index ac32e96c2..a1ab339c4 100644
--- a/webroot/AutoSa/AutoSa/views.py
+++ b/webroot/AutoSa/AutoSa/views.py
@@ -990,6 +990,17 @@ def logHistory(request):
                 return HttpResponse(content)
 
 
+@admin_required
+def killSession(request):
+    if request.method == 'GET':
+        logid = request.GET.get('id', 0)
+        pid = Pid.objects.filter(logid=logid)
+        if pid:
+            pid = pid[0]
+            os.kill(pid.cpid, 9)
+
+
+
 
 
 
diff --git a/webroot/AutoSa/templates/base.html b/webroot/AutoSa/templates/base.html
index 49a52c4e5..578320bdc 100644
--- a/webroot/AutoSa/templates/base.html
+++ b/webroot/AutoSa/templates/base.html
@@ -104,8 +104,6 @@
           <ul id="userMenu" class="nav nav-list navbar-collapse.in menu-second">
             <li><a href="/showUser/"><i class="glyphicon glyphicon-send"></i> 查看用户</a></li>
             <li><a href="/addUser/"><i class="glyphicon glyphicon-send"></i> 添加用户</a></li>
-              <li><a href="/showGroup/"><i class="glyphicon glyphicon-send"></i> 查看属组</a></li>
-              <li><a href="/addGroup/"><i class="glyphicon glyphicon-send"></i> 添加属组</a></li>
           </ul>
           <!--<div class="menu-first" ><a href="#monitorMenu" data-toggle="collapse"><i class="glyphicon glyphicon-th"></i> 执行命令</a></div>
           <ul id="monitorMenu" class="nav nav-list navbar-collapse.in menu-second">
diff --git a/webroot/AutoSa/templates/logView.html b/webroot/AutoSa/templates/logView.html
index 111697802..22defde4b 100644
--- a/webroot/AutoSa/templates/logView.html
+++ b/webroot/AutoSa/templates/logView.html
@@ -24,7 +24,7 @@
                 <td>{{ log.host }}</td>
                 <td><a href="#">监控</a></td>
                 <td><a href="/logHistory/?id={{ log.id }}" class="log_command">命令统计</a></td>
-                <td><a href="#">阻断</a> </td>
+                <td><a href="/killSession/?id={{ log.id }}}}">阻断</a> </td>
                 <td>{{ log.start_time|stamp2str }}</td>
                 <td>{{ log.end_time|stamp2str }}</td>
             </tr>