From 13ab5f14e08180aa919a6834b538d0d95ef74a85 Mon Sep 17 00:00:00 2001 From: rhigdon Date: Sat, 31 Aug 2013 01:05:40 +0000 Subject: [PATCH 1/2] switch log line for old logging type --- configure-syslog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure-syslog.py b/configure-syslog.py index 1d7f12b..94f49ca 100755 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -319,7 +319,7 @@ def printEnvironment(current_environment): if current_environment['syslog_versions']: for i, version in enumerate(current_environment['syslog_versions'], 1): line = "\t%d. %s(%s)" % (i, version[0], version[1]) - LOGGER.info(line) + Logger.printLog(line) else: Logger.printLog("\tNo Syslog Version Found......", prio = 'crit', print_comp = True) From a550e78a2f7e8d08b447b2c1bedfea73a593e907 Mon Sep 17 00:00:00 2001 From: rhigdon Date: Sat, 31 Aug 2013 01:18:37 +0000 Subject: [PATCH 2/2] fix regex to look for rsyslogd instead of rsyslog --- configure-syslog.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure-syslog.py b/configure-syslog.py index 94f49ca..6c6625c 100755 --- a/configure-syslog.py +++ b/configure-syslog.py @@ -408,13 +408,13 @@ def get_syslog_version(verify_config_paths=False): SYSLOG_PATHS = [ # (syslog type, command, conf path, conf.d path) - ("rsyslog", "rsyslogd -v", "/etc/rsyslog.conf", "/etc/rsyslog.d/"), - ("syslog-ng", "syslog-ng --version", "/etc/syslog-ng/syslog-ng.conf", "/etc/syslog-ng/") + ("rsyslog", "rsyslogd", "-v", "/etc/rsyslog.conf", "/etc/rsyslog.d/"), + ("syslog-ng", "syslog-ng", "--version", "/etc/syslog-ng/syslog-ng.conf", "/etc/syslog-ng/") ] for s in SYSLOG_PATHS: - p = subprocess.Popen(s[1], shell=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE) + p = subprocess.Popen(s[1] + ' ' + s[2], shell=True, stderr=subprocess.PIPE, stdout=subprocess.PIPE) p.wait() if p.returncode != 0: continue @@ -422,13 +422,13 @@ def get_syslog_version(verify_config_paths=False): version_line = p.stdout.readlines()[0] if verify_config_paths: - if not os.path.isfile(s[2]) or not os.path.isdir(s[3]): + if not os.path.isfile(s[3]) or not os.path.isdir(s[4]): continue # extract the version number from the daemon's version report, # only cares about the major and minor version numbers and ignores # the point number. - version_pattern = r'%s (\d+\.+\d)' % s[0] + version_pattern = r'%s (\d+\.+\d)' % s[1] version_string = re.search(version_pattern, version_line).group(1) return [(s[0], version_string)]