github/jumpserver
1
0
Fork 0
mirror of https://github.com/jumpserver/jumpserver.git synced 2025-07-11 13:53:28 +00:00
Code Issues Projects Releases Wiki Activity

pull issue #120

Browse Source
This commit is contained in:
kelianchun_miller 2016-03-18 23:36:31 +08:00
parent 7dcf050dc4
commit b2ccbc3f9e
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
connect.py
View File

@ -92,8 +92,8 @@ class Tty(object):
self.remote_ip = '' self.remote_ip = ''
self.login_type = login_type self.login_type = login_type
self.vim_flag = False self.vim_flag = False
self.ps1_pattern = re.compile('\[.*@.*\][\$#]\s') self.ps1_pattern = re.compile('\[?.*@.*\]?[\$#]\s')
self.vim_pattern = re.compile(r'\Wvi[m]+\s.* | \Wfg\s.*', re.X) self.vim_pattern = re.compile(r'\W?vi[m]?\s.* | \W?fg\s.*', re.X)
self.vim_data = '' self.vim_data = ''
self.stream = None self.stream = None
self.screen = None self.screen = None
@ -141,6 +141,7 @@ class Tty(object):
:return:返回最后的处理结果 :return:返回最后的处理结果
""" """
command = '' command = ''
try:
self.stream.feed(data) self.stream.feed(data)
# 从虚拟屏幕中获取处理后的数据 # 从虚拟屏幕中获取处理后的数据
for line in reversed(self.screen.buffer): for line in reversed(self.screen.buffer):
@ -160,6 +161,8 @@ class Tty(object):
self.vim_flag = True self.vim_flag = True
# 虚拟屏幕清空 # 虚拟屏幕清空
self.screen.reset() self.screen.reset()
except Exception:
pass
return command return command
def get_log(self): def get_log(self):