diff --git a/connect.py b/connect.py index 6b69bb1c8..bb4924ddd 100755 --- a/connect.py +++ b/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() diff --git a/jlog/models.py b/jlog/models.py index 7902ec6ca..8982317b5 100644 --- a/jlog/models.py +++ b/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 ''' diff --git a/jlog/views.py b/jlog/views.py index 02db32a82..1647f9251 100644 --- a/jlog/views.py +++ b/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: diff --git a/run_server.py b/run_server.py index 365f2636d..4d59ac582 100755 --- a/run_server.py +++ b/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()