From 10f1d20dfd823ba2b21601389b209172d67b1ee3 Mon Sep 17 00:00:00 2001 From: Zack Cerza Date: Tue, 30 Jun 2015 14:29:13 -0600 Subject: [PATCH] syslog: Refactor to expose logfile names Signed-off-by: Zack Cerza --- teuthology/task/internal.py | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/teuthology/task/internal.py b/teuthology/task/internal.py index 3adc6ad217..a57eddf62e 100644 --- a/teuthology/task/internal.py +++ b/teuthology/task/internal.py @@ -581,21 +581,26 @@ def syslog(ctx, config): log.info('Starting syslog monitoring...') archive_dir = misc.get_archive_dir(ctx) + log_dir = '{adir}/syslog'.format(adir=archive_dir) run.wait( ctx.cluster.run( args=[ 'mkdir', '-p', '-m0755', '--', - '{adir}/syslog'.format(adir=archive_dir), + log_dir, ], wait=False, ) ) CONF = '/etc/rsyslog.d/80-cephtest.conf' - conf_fp = StringIO(''' -kern.* -{adir}/syslog/kern.log;RSYSLOG_FileFormat -*.*;kern.none -{adir}/syslog/misc.log;RSYSLOG_FileFormat -'''.format(adir=archive_dir)) + kern_log = '{log_dir}/kern.log'.format(log_dir=log_dir) + misc_log = '{log_dir}/misc.log'.format(log_dir=log_dir) + conf_lines = [ + 'kern.* -{kern_log};RSYSLOG_FileFormat'.format(kern_log=kern_log), + '*.*;kern.none -{misc_log};RSYSLOG_FileFormat'.format( + misc_log=misc_log), + ] + conf_fp = StringIO('\n'.join(conf_lines)) try: for rem in ctx.cluster.remotes.iterkeys(): misc.sudo_write_file( -- 2.39.5