[prev in list] [next in list] [prev in thread] [next in thread] 

List:       linux-ha-dev
Subject:    [Linux-ha-dev] [PATCH]Monitor failure and IPv6 support of apache-ra
From:       nozawat <nozawat () gmail ! com>
Date:       2011-12-14 5:27:56
Message-ID: CAACmvNEwLx6Q2i1c1TJX6s-6uDU9WsfbhVYD-Ugmb7RoUVX01Q () mail ! gmail ! com
[Download RAW message or body]

Hi

 1.apache.patch(Coping of monitor failure)
   When a newline code is included, I fail in a monitor.
   Therefore I coped with a newline code.

 2.http-mon.sh.patch(IPv6 support)
   When I did wget, I assigned 127.0.0.1 to --bind-address optionally,
but this deleted it now for IPv4.
   Even IPv6 works by doing so it.

Regards,
Tomo

["http-mon.sh.patch" (application/octet-stream)]

diff --git a/heartbeat/http-mon.sh b/heartbeat/http-mon.sh
index 586051c..4df4732 100644
--- a/heartbeat/http-mon.sh
+++ b/heartbeat/http-mon.sh
@@ -15,7 +15,7 @@
 # default options for http clients
 # NB: We _always_ test a local resource, so it should be
 # safe to connect from the local interface.
-WGETOPTS="-O- -q -L --no-proxy --bind-address=127.0.0.1"
+WGETOPTS="-O- -q -L --no-proxy"
 CURLOPTS="-o - -Ss -L --interface lo"
 
 #

["apache.patch" (application/octet-stream)]

diff --git a/heartbeat/apache b/heartbeat/apache
index d9adc62..d3cdc52 100755
--- a/heartbeat/apache
+++ b/heartbeat/apache
@@ -272,7 +272,7 @@ monitor_apache_basic() {
     ocf_log err "could not find a http client; make sure that either wget or curl is available"
 	return $OCF_ERR_CONFIGURED
   fi
-  ${ourhttpclient}_func "$STATUSURL" | grep -Ei "$TESTREGEX" > /dev/null
+  ${ourhttpclient}_func "$STATUSURL" | grep -zEi "$TESTREGEX" > /dev/null
 }
 monitor_apache() {
   silent_status


_______________________________________________________
Linux-HA-Dev: Linux-HA-Dev@lists.linux-ha.org
http://lists.linux-ha.org/mailman/listinfo/linux-ha-dev
Home Page: http://linux-ha.org/


[prev in list] [next in list] [prev in thread] [next in thread]