Perform _HOST_ -> $host substitution on $url for more informative display

when there are failures.  Make $summary more consistent (prepend "http "
for errors and warnings to match "ok" and other plugins)

diff --git a/src/lib/Spong/Network/plugins/check_http b/src/lib/Spong/Network/plugins/check_http
index ec9c1103a60734552a41288f0c73a84e874585ce..ba67bd4238c8d027189f152a0a817c84f23c624d 100755 (executable)
--- a/src/lib/Spong/Network/plugins/check_http
+++ b/src/lib/Spong/Network/plugins/check_http
@@ -23,7 +23,13 @@ sub check_http {
          my($hpart,$urlpath) = ( $url =~ m|^([^/]+)(/.*)| );
          my($hname,$port) = split(/:/,$hpart);
          $port = 80 if ! $port;
-         $hname = $host if ( ! $hname || $hname eq '_HOST_' );
+         #$hname = $host if ( ! $hname || $hname eq '_HOST_' );
+         if ( ! $hname ) {
+            $hname = $host;
+         } elsif ( $hname eq '_HOST_' ) {
+            $hname = $host;
+            $url =~ s/_HOST_/$host/;
+         }
          
          my $message = 
            &check_tcp( $hname, $port,
@@ -33,14 +39,14 @@ sub check_http {
             my $code = $1;
         
            if( $code >= 500 ) {
-              $color = "red"; $summary = "error - $code - $url";
+              $color = "red"; $summary = "http error - $code - $url";
                # Treat a 401 (authorization Required) code as a green
            } elsif( $code >= 400 && $code != 401) {
               if( $color ne "red" ) {
-                 $color = "yellow"; $summary = "warning - $code - $url"; }
+                 $color = "yellow"; $summary = "http warning - $code - $url"; }
            } else { 
               if( $color ne "red" && $color ne "yellow" ) {
-                 $color = "green"; $summary = "ok - $code"; }
+                 $color = "green"; $summary = "http ok - $code"; }
            }
          } elsif( $message !~ /HTTP/m ) { 
            $color = "red"; $summary = "no response from http server";
@@ -61,14 +67,15 @@ sub check_http {
            my $code = $1;
         
            if( $code >= 500 ) {
-              $color = "red"; $summary = "error - $code - $file";
+              $color = "red"; $summary = "http error - $code - $file";
                # Treat a 401 (authorization Required) code as a green
            } elsif( $code >= 400 && $code != 401) {
               if( $color ne "red" ) {
-                 $color = "yellow"; $summary = "warning - $code - $file"; }
+                 $color = "yellow"; $summary = "http warning - $code - $file";
+              }
            } else { 
               if( $color ne "red" && $color ne "yellow" ) {
-                 $color = "green"; $summary = "ok - $code"; }
+                 $color = "green"; $summary = "http ok - $code"; }
            }
          } elsif( $message !~ /HTTP/m ) { 
            $color = "red"; $summary = "no response from http server";