github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-17 08:21:38 +00:00
Code Issues Projects Releases Wiki Activity

bugfix

Browse Source
This commit is contained in:
liuzheng712 2016-03-29 21:16:30 +08:00
parent e07305ef46
commit 2f2289a863
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
jlog/log_api.py
View File

@ -90,7 +90,10 @@ def renderJSON(script_path, time_file_path):
offset = 0 offset = 0
for t in timing: for t in timing:
dt = scriptf.read(t[1]) dt = scriptf.read(t[1])
data = escapeString(dt) try:
data = dt.encode('unicode_escape').decode('utf-8', 'ignore')
except (UnicodeEncodeError, UnicodeDecodeError):
data = dt.decode('utf-8', 'ignore')
# print ('###### (%s, %s)' % (t[1], repr(data))) # print ('###### (%s, %s)' % (t[1], repr(data)))
offset += t[0] offset += t[0]
ret[str(offset/float(1000))] = data ret[str(offset/float(1000))] = data