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

Merge branch 'TermLogRecorder' of github.com:jumpserver/jumpserver into TermLogRecorder

pull/170/head
liuzheng712 2016-03-27 22:30:04 +08:00
parent c937abe098 74ac1dc06b
commit ebef54ca44
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
connect.py
View File

@ -33,6 +33,7 @@ from jumpserver.settings import LOG_DIR
from jperm.ansible_api import MyRunner from jperm.ansible_api import MyRunner
# from jlog.log_api import escapeString # from jlog.log_api import escapeString
from jlog.models import ExecLog, FileLog from jlog.models import ExecLog, FileLog
from jlog.views import TermLogRecorder
login_user = get_object(User, username=getpass.getuser()) login_user = get_object(User, username=getpass.getuser())
try: try:
@ -299,6 +300,8 @@ class SshTty(Tty):
使用paramiko模块的channel，连接后端，进入交互式 使用paramiko模块的channel，连接后端，进入交互式
""" """
log_file_f, log_time_f, log = self.get_log() log_file_f, log_time_f, log = self.get_log()
termlog = TermLogRecorder(User.objects.get(id=self.user.id))
termlog.setid(log.id)
old_tty = termios.tcgetattr(sys.stdin) old_tty = termios.tcgetattr(sys.stdin)
pre_timestamp = time.time() pre_timestamp = time.time()
data = '' data = ''
@ -335,6 +338,8 @@ class SshTty(Tty):
if msg.errno == errno.EAGAIN: if msg.errno == errno.EAGAIN:
continue continue
now_timestamp = time.time() now_timestamp = time.time()
termlog.write(x)
termlog.recoder = False
log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(x))) log_time_f.write('%s %s\n' % (round(now_timestamp-pre_timestamp, 4), len(x)))
log_time_f.flush() log_time_f.flush()
log_file_f.write(x) log_file_f.write(x)
@ -355,6 +360,7 @@ class SshTty(Tty):
x = os.read(sys.stdin.fileno(), 4096) x = os.read(sys.stdin.fileno(), 4096)
except OSError: except OSError:
pass pass
termlog.recoder = True
input_mode = True input_mode = True
input_str += x input_str += x
if str(x) in ['\r', '\n', '\r\n']: if str(x) in ['\r', '\n', '\r\n']:
@ -387,6 +393,8 @@ class SshTty(Tty):
log_file_f.write('End time is %s' % datetime.datetime.now()) log_file_f.write('End time is %s' % datetime.datetime.now())
log_file_f.close() log_file_f.close()
log_time_f.close() log_time_f.close()
termlog.save()
log.log_path = termlog.filename
log.is_finished = True log.is_finished = True
log.end_time = datetime.datetime.now() log.end_time = datetime.datetime.now()
log.save() log.save()

1
jlog/views.py
View File

@ -206,6 +206,7 @@ class TermLogRecorder(object):
self.commands = [] self.commands = []
self._lists = None self._lists = None
self.file = None self.file = None
self.filename = None
self._data = None self._data = None
self.vim_pattern = re.compile(r'\W?vi[m]?\s.* | \W?fg\s.*', re.X) self.vim_pattern = re.compile(r'\W?vi[m]?\s.* | \W?fg\s.*', re.X)
self._in_vim = False self._in_vim = False