From 9e78fd3651b29ce66efce569445163b1190e8ab4 Mon Sep 17 00:00:00 2001 From: ibuler Date: Fri, 22 Apr 2016 11:51:36 +0800 Subject: [PATCH] Merge master to dev (#212) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update install.py 修改centos7支持 * Update install.py * Support resize web terminal size Support resize web terminal size. Change new windows to a new tab. May be more hommization * Static bug (#204) * 紧急修复下载文件后静态文件404问题 * 紧急修复监控白屏问题 * bugfix(upload web) When download file, static file will unreachable. Didn't change dir fixed * bugfix(upload web) When download file, static file will unreachable. (#206) (#207) * Update install.py 修改centos7支持 * Update install.py * Support resize web terminal size Support resize web terminal size. Change new windows to a new tab. May be more hommization * Static bug (#204) * 紧急修复下载文件后静态文件404问题 * 紧急修复监控白屏问题 * bugfix(upload web) When download file, static file will unreachable. Didn't change dir fixed * fix bug index out of range (#210) --- jlog/views.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/jlog/views.py b/jlog/views.py index ff1239e8e..d8a4268d1 100644 --- a/jlog/views.py +++ b/jlog/views.py @@ -240,6 +240,7 @@ class TermLogRecorder(object): TermLogRecorder.loglist[str(id)] = [self] def write(self, msg): + """ if self.recoder and (not self._in_vim): if self.commands.__len__() == 0: self._stream.feed(msg) @@ -256,6 +257,7 @@ class TermLogRecorder(object): self._screen.reset() else: self._command() + """ try: self.write_message(msg) except: