From 26c31feb4afd573191a81eab19093f624ca07843 Mon Sep 17 00:00:00 2001 From: ibuler Date: Thu, 6 Nov 2014 22:56:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E6=97=A5?= =?UTF-8?q?=E5=BF=97bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jumpserver.py | 12 +++++++----- webroot/AutoSa/log_handler.py | 11 ++++++----- 2 files changed, 13 insertions(+), 10 deletions(-) diff --git a/jumpserver.py b/jumpserver.py index f942d2a7f..0529d7fc7 100755 --- a/jumpserver.py +++ b/jumpserver.py @@ -110,6 +110,7 @@ def connect(host, port, user, password): """Use pexpect module to connect other server.""" log_date_dir = '%s/%s' % (log_dir, time.strftime('%Y%m%d')) if not os.path.isdir(log_date_dir): + os.mkdir(log_date_dir) os.mkdir(log_date_dir, 0777) structtime_start = time.localtime() datetime_start = time.strftime('%Y%m%d%H%M%S', structtime_start) @@ -250,11 +251,12 @@ def exec_cmd_servers(username): break exec_log_dir = os.path.join(log_dir, 'exec_cmds') if not os.path.isdir(exec_log_dir): - os.mkdir(exec_log_dir, 0777) - filename = "%s/%s.log" % (exec_log_dir, time.strftime('%Y%m%d')) - f = open(filename, 'a') - f.write("DateTime: %s User: %s Host: %s Cmds: %s" % - (time.strftime('%Y/%m/%d %H:%M:%S'), username, hosts, cmd)) + os.mkdir(exec_log_dir) + os.chmod(exec_log_dir, 0777) + filename = "%s/%s.log" % (exec_log_dir, time.strftime('%Y%m%d')) + f = open(filename, 'a') + 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: remote_exec_cmd(host, username, cmd) diff --git a/webroot/AutoSa/log_handler.py b/webroot/AutoSa/log_handler.py index f7b3d10e6..769ac65d3 100755 --- a/webroot/AutoSa/log_handler.py +++ b/webroot/AutoSa/log_handler.py @@ -19,11 +19,12 @@ def log_hanler(logid): if log: log = log[0] filename = log.logfile - ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename)) - ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename)) - ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename)) - if (ret1 + ret2 + ret3) == 0: - print 'Handler % ok.' % filename + if os.path.isfile(filename): + ret1 = os.system('cat %s | grep "DateTime" > %s.his' % (filename, filename)) + ret2 = os.system('cat %s | grep "\[.*@.*\][\$\#]" >> %s.his' % (filename, filename)) + ret3 = os.system('cat %s | grep "EndTime" >> %s.his' % (filename, filename)) + if (ret1 + ret2 + ret3) == 0: + print 'Handler % ok.' % filename def set_finish(id):