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

Merge pull request #154 from jumpserver/term_log_bug 

fix: command recoder bug fix
pull/164/head
ibuler 2016-03-23 17:07:28 +08:00
parent 0b05899818 f1ff52eb6b
commit 6d302eb25a
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
run_server.py
View File

@ -351,18 +351,18 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
pass
def on_message(self, message):
data = json.loads(message)
if not data:
jsondata = json.loads(message)
if not jsondata:
return
if 'resize' in data.get('data'):
if 'resize' in jsondata.get('data'):
self.channel.resize_pty(
data.get('data').get('resize').get('cols', 80),
data.get('data').get('resize').get('rows', 24)
jsondata.get('data').get('resize').get('cols', 80),
jsondata.get('data').get('resize').get('rows', 24)
)
elif data.get('data'):
elif jsondata.get('data'):
self.term.input_mode = True
if str(data['data']) in ['\r', '\n', '\r\n']:
if str(jsondata['data']) in ['\r', '\n', '\r\n']:
if self.term.vim_flag:
match = self.term.ps1_pattern.search(self.term.vim_data)
if match:
@ -377,7 +377,7 @@ class WebTerminalHandler(tornado.websocket.WebSocketHandler):
self.term.vim_data = ''
self.term.data = ''
self.term.input_mode = False
self.channel.send(data['data'])
self.channel.send(jsondata['data'])
else:
pass