diff options
| author | Michael Boelen <michael.boelen@cisofy.com> | 2017-03-20 15:12:55 +0300 |
|---|---|---|
| committer | Michael Boelen <michael.boelen@cisofy.com> | 2017-03-20 15:12:55 +0300 |
| commit | 90e240cfb5528f0cd9c7aecb00ac3fd25ea6fb04 (patch) | |
| tree | 7293749eaa146ecf9b1fa869d9759934ec630d82 | |
| parent | 72aed70677894de8d8a50690dac6b8e0080295b4 (diff) | |
[CUPS-2308] removed exception handler, improved logging
| -rw-r--r-- | include/tests_printers_spools | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/include/tests_printers_spools b/include/tests_printers_spools index 5a5515b9..e576034f 100644 --- a/include/tests_printers_spools +++ b/include/tests_printers_spools @@ -146,21 +146,20 @@ N=$((N + 1)) FOUND=1 done - if [ ${FOUND} -eq 0 ]; then - ReportException "${TEST_NO}:1" "No listen statement found in CUPS configuration file" - fi # Check if daemon is only running on localhost - if [ ${N} -eq 1 ]; then + if [ ${FOUND} -eq 0 ]; then + LogText "Result: no listen statement found in CUPS configuration file" + elif [ ${N} -eq 1 ]; then if [ "${FIND}" = "localhost:631" -o "${FIND}" = "127.0.0.1:631" ]; then LogText "Result: CUPS daemon only running on localhost" AddHP 2 2 - else + else LogText "Result: CUPS daemon running on one or more interfaces (not limited to localhost)" ReportSuggestion ${TEST_NO} "Check CUPS configuration if it really needs to listen on the network" AddHP 1 2 fi - else + else LogText "Result: CUPS daemon is running on several network addresses" ReportSuggestion ${TEST_NO} "Check CUPS configuration if it really needs to run on several network addresses" AddHP 1 2 @@ -177,7 +176,7 @@ if [ ${N} -eq 0 ]; then Display --indent 2 --text "- Checking CUPS addresses/sockets" --result "${STATUS_NONE}" --color WHITE LogText "Result: no addresses found on which CUPS daemon is listening" - else + else Display --indent 2 --text "- Checking CUPS addresses/sockets" --result "${STATUS_FOUND}" --color GREEN LogText "Result: CUPS daemon is listening on network/socket" fi |