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

修改记录日志bug

pull/2/head
ibuler 2014-11-06 22:56:36 +08:00
parent d8e4efe7cc
commit 26c31feb4a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
jumpserver.py
View File

@ -110,6 +110,7 @@ def connect(host, port, user, password):
"""Use pexpect module to connect other server.""" """Use pexpect module to connect other server."""
log_date_dir = '%s/%s' % (log_dir, time.strftime('%Y%m%d')) log_date_dir = '%s/%s' % (log_dir, time.strftime('%Y%m%d'))
if not os.path.isdir(log_date_dir): if not os.path.isdir(log_date_dir):
os.mkdir(log_date_dir)
os.mkdir(log_date_dir, 0777) os.mkdir(log_date_dir, 0777)
structtime_start = time.localtime() structtime_start = time.localtime()
datetime_start = time.strftime('%Y%m%d%H%M%S', structtime_start) datetime_start = time.strftime('%Y%m%d%H%M%S', structtime_start)
@ -250,11 +251,12 @@ def exec_cmd_servers(username):
break break
exec_log_dir = os.path.join(log_dir, 'exec_cmds') exec_log_dir = os.path.join(log_dir, 'exec_cmds')
if not os.path.isdir(exec_log_dir): if not os.path.isdir(exec_log_dir):
os.mkdir(exec_log_dir, 0777) os.mkdir(exec_log_dir)
filename = "%s/%s.log" % (exec_log_dir, time.strftime('%Y%m%d')) os.chmod(exec_log_dir, 0777)
f = open(filename, 'a') filename = "%s/%s.log" % (exec_log_dir, time.strftime('%Y%m%d'))
f.write("DateTime: %s User: %s Host: %s Cmds: %s" % f = open(filename, 'a')
(time.strftime('%Y/%m/%d %H:%M:%S'), username, hosts, cmd)) f.write("DateTime: %s User: %s Host: %s Cmds: %s\n" %
(time.strftime('%Y/%m/%d %H:%M:%S'), username, hosts, cmd))
for host in hosts: for host in hosts:
remote_exec_cmd(host, username, cmd) remote_exec_cmd(host, username, cmd)

11
webroot/AutoSa/log_handler.py
View File

@ -19,11 +19,12 @@ def log_hanler(logid):
if log: if log:
log = log[0] log = log[0]
filename = log.logfile filename = log.logfile
ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename)) if os.path.isfile(filename):
ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename)) ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename))
ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename)) ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename))
if (ret1 + ret2 + ret3) == 0: ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename))
print 'Handler % ok.' % filename if (ret1 + ret2 + ret3) == 0:
print 'Handler % ok.' % filename
def set_finish(id): def set_finish(id):