diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-14 14:15:10 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2016-09-14 14:15:10 +0300 |
| commit | 76aece2e6194f93fb7cff7f51ae1a0ac21efc0e2 (patch) | |
| tree | f1324702af322c9594834c562e793b1c6034eea1 /include/tests_logging | |
| parent | df2fff6cc70cbdf7219fcbcd9d692231f8033a0c (diff) | |
Removed warning and added more report data
Diffstat (limited to 'include/tests_logging')
| -rw-r--r-- | include/tests_logging | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/include/tests_logging b/include/tests_logging index 538488fc..0aae93db 100644 --- a/include/tests_logging +++ b/include/tests_logging @@ -48,7 +48,6 @@ Display --indent 2 --text "- Checking for a running log daemon" --result "${STATUS_WARNING}" --color RED LogText "Result: Could not find a syslog daemon like syslog, syslog-ng, rsyslog, metalog, systemd-journal" ReportSuggestion ${TEST_NO} "Check if any syslog daemon is running and correctly configured." - ReportWarning ${TEST_NO} "No syslog daemon found" AddHP 0 3 else Display --indent 2 --text "- Checking for a running log daemon" --result "${STATUS_OK}" --color GREEN @@ -72,6 +71,8 @@ Display --indent 4 --text "- Checking Syslog-NG status" --result "${STATUS_FOUND}" --color GREEN SYSLOG_DAEMON_PRESENT=1 SYSLOG_NG_RUNNING=1 + Report "syslog_daemon_present=1" + Report "syslog_daemon[]=syslog-ng" else LogText "Result: Syslog-ng NOT found in process list" Display --indent 4 --text "- Checking Syslog-NG status" --result "${STATUS_NOT_FOUND}" --color WHITE @@ -92,7 +93,6 @@ else LogText "Result: Syslog-NG configuration file seems NOT to be consistent" Display --indent 6 --text "- Checking Syslog-NG consistency" --result "${STATUS_WARNING}" --color RED - ReportWarning ${TEST_NO} "Found one or more problems in Syslog-NG configuration file" ReportSuggestion ${TEST_NO} "Check the Syslog-NG configuration file and/or run a manual consistency check with: syslog-ng -s" fi fi @@ -108,6 +108,8 @@ if [ ${RUNNING} -eq 1 ]; then Display --indent 4 --text "- Checking systemd journal status" --result "${STATUS_FOUND}" --color GREEN SYSTEMD_JOURNAL_RUNNING=1 + Report "syslog_daemon_present=1" + Report "syslog_daemon[]=systemd-journal" else Display --indent 4 --text "- Checking systemd journal status" --result "${STATUS_NOT_FOUND}" --color WHITE fi @@ -126,6 +128,8 @@ Display --indent 4 --text "- Checking Metalog status" --result "${STATUS_FOUND}" --color GREEN SYSLOG_DAEMON_PRESENT=1 METALOG_RUNNING=1 + Report "syslog_daemon_present=1" + Report "syslog_daemon[]=metalog" else LogText "Result: metalog NOT found in process list" Display --indent 4 --text "- Checking Metalog status" --result "${STATUS_NOT_FOUND}" --color WHITE @@ -145,6 +149,8 @@ Display --indent 4 --text "- Checking RSyslog status" --result "${STATUS_FOUND}" --color GREEN SYSLOG_DAEMON_PRESENT=1 RSYSLOG_RUNNING=1 + Report "syslog_daemon_present=1" + Report "syslog_daemon[]=rsyslog" else LogText "Result: rsyslogd NOT found in process list" Display --indent 4 --text "- Checking RSyslog status" --result "${STATUS_NOT_FOUND}" --color WHITE |