github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity

bugfix

pull/180/head
liuzheng712 2016-03-29 21:18:04 +08:00
parent 2f2289a863
commit 263ff1ee08
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jlog/log_api.py
View File

@ -90,13 +90,13 @@ 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])
try: # try:
data = dt.encode('unicode_escape').decode('utf-8', 'ignore') # data = dt.encode('unicode_escape').decode('utf-8', 'ignore')
except (UnicodeEncodeError, UnicodeDecodeError): # except (UnicodeEncodeError, UnicodeDecodeError):
data = dt.decode('utf-8', 'ignore') # 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))] = dt
return dumps(ret) return dumps(ret)
def kill_invalid_connection(): def kill_invalid_connection():