- improved configtest output

Changed files:
    nagios.init -> 1.21

diff --git a/nagios.init b/nagios.init
index 3116508a21ed5ff2f34436228399f3d13a3ad1e8..a159c1fb6d3b3f0a497c19711cac142f1d7e3f40 100644 (file)
--- a/nagios.init
+++ b/nagios.init
@@ -41,9 +41,16 @@ checkconfig() {
 
        if [ $details = 1 ]; then
                # run config test and display report (status action)
-               show "Checking %s configuration" "Nagios"; busy; echo
-               configtest
+               show "Checking %s configuration" "Nagios"; busy
+               local out
+               out=`configtest 2>&1`
                RETVAL=$?
+               if [ $RETVAL = 0 ]; then
+                       ok
+               else
+                       fail
+                       echo >&2 "$out"
+               fi
        else
                # run config test and abort with nice message if failed
                # (for actions checking status before action).