filename

connect.py

@@ -394,7 +394,7 @@ class SshTty(Tty):
             log_file_f.close()
             log_time_f.close()
             termlog.save()
-            log.log_path = termlog.filename
+            log.filename = termlog.filename
             log.is_finished = True
             log.end_time = datetime.datetime.now()
             log.save()

jlog/models.py

@@ -13,6 +13,7 @@ class Log(models.Model):
     pid = models.IntegerField()
     is_finished = models.BooleanField(default=False)
     end_time = models.DateTimeField(null=True)
+    filename = models.CharField(max_length=40)
     '''
     add by liuzheng
     '''

jlog/views.py

@@ -138,7 +138,7 @@ def log_record(request):
         if log_id:
             TermL = TermLogRecorder(request.user)
             log = Log.objects.get(id=int(log_id))
-            return HttpResponse(TermL.load_full_log(filename=log.log_path))
+            return HttpResponse(TermL.load_full_log(filename=log.filename))
         else:
             return HttpResponse("ERROR")
     else:

run_server.py

@@ -399,7 +399,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
             self.log_file_f.write('End time is %s' % datetime.datetime.now())
             self.log.is_finished = True
             self.log.end_time = datetime.datetime.now()
-            self.log.log_path = self.termlog.filename
+            self.log.filename = self.termlog.filename
             self.log.save()
             self.log_time_f.close()
             self.ssh.close()