完成上传下载

jlog/models.py

@@ -33,6 +33,7 @@ class ExecLog(models.Model):
     host = models.TextField()
     cmd = models.TextField()
     remote_ip = models.CharField(max_length=100)
+    result = models.TextField(default='')
     datetime = models.DateTimeField(auto_now=True)
 
 
@@ -42,6 +43,7 @@ class FileLog(models.Model):
     filename = models.TextField()
     type = models.CharField(max_length=20)
     remote_ip = models.CharField(max_length=100)
+    result = models.TextField(default='')
     datetime = models.DateTimeField(auto_now=True)
 
 

jlog/urls.py

@@ -5,6 +5,7 @@ from jlog.views import *
 urlpatterns = patterns('',
                        (r'^$', log_list),
                        (r'^log_list/(\w+)/$', log_list),
+                       (r'^log_detail/(\w+)/$', log_detail),
                        (r'^history/$', log_history),
                        (r'^log_kill/', log_kill),
                        (r'^record/$', log_record),

jlog/views.py

@@ -129,3 +129,21 @@ def web_terminal(request):
     web_terminal_uri = 'ws://%s/terminal?id=%s&role=%s' % (WEB_SOCKET_HOST, asset_id, role_name)
     return render_to_response('jlog/web_terminal.html', locals())
 
+
+@require_role('admin')
+def log_detail(request, offset):
+    log_id = request.GET.get('id')
+    if offset == 'exec':
+        log = get_object(ExecLog, id=log_id)
+        assets_hostname = log.host.split(' ')
+        result = eval(str(log.result))
+        return my_render('jlog/exec_detail.html', locals(), request)
+    elif offset == 'file':
+        log = get_object(FileLog, id=log_id)
+        assets_hostname = log.host.split(' ')
+        file_list = log.filename.split(' ')
+        try:
+            result = eval(str(log.result))
+        except (SyntaxError, NameError):
+            result = {}
+        return my_render('jlog/file_detail.html', locals(), request)