Skip to content

Commit

Permalink
filename
Browse files Browse the repository at this point in the history
  • Loading branch information
liuzheng committed Mar 28, 2016
1 parent 9589095 commit f3d863e
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 3 deletions.
2 changes: 1 addition & 1 deletion connect.py
Expand Up @@ -394,7 +394,7 @@ def posix_shell(self):
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()
Expand Down
1 change: 1 addition & 0 deletions jlog/models.py
Expand Up @@ -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
'''
Expand Down
2 changes: 1 addition & 1 deletion jlog/views.py
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion run_server.py
Expand Up @@ -399,7 +399,7 @@ def on_close(self):
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()
Expand Down

0 comments on commit f3d863e

Please sign in to comment.