コミット: 4b42962c732bd89595513fb54dd12226ee59a136 - ultramonkey_l7_v2 (git)

UltraMonkey-L7 branches for my development

コミットメタ情報

• リビジョン: 4b42962c732bd89595513fb54dd12226ee59a136 (tree)
• 日時: 2010-10-05 16:11:07
• 作者: TATEISHI Katsuyuki <kt@whee...>
• コミッター: TATEISHI Katsuyuki

ログメッセージ

Merge commit 'origin/hb-ra-processcheck-fix'

* CHANGES: merged

configure.ac: discard changes for old version number

Conflicts:
CHANGES
configure.ac

変更サマリ

• modified: CHANGES
• modified: doc/heartbeat-ra/L7directord
• modified: doc/heartbeat-ra/L7vsd
• modified: doc/heartbeat-ra/README
• modified: doc/heartbeat-ra/SSLProxy
• modified: init.d/l7vsd.sh

差分

--- a/CHANGES
+++ b/CHANGES
@@ -1,7 +1,10 @@
-[XXX. XX XXXX] 2.1.3-1
+[XXX. XX XXXX] 2.1.3-2
   - Fix checkinig content (l7directord)
   - Add duplicate log ID check in 'make distcheck'
 
+[Jun. 16 2010] 2.1.3-1 Sugiura Jun
+  - Fix Resource Agents for HBv2. (L7directord,L7vsd,SSLProxy)
+
 [Aug. 24 2009] 2.1.3-0 TATEISHI Katsuyuki
   - Translate man files into English. (man)
   - Fix purging sorryserver to respect reloaded configuration. (l7directord)

--- a/doc/heartbeat-ra/L7directord
+++ b/doc/heartbeat-ra/L7directord
@@ -112,7 +112,7 @@ l7directord_pkill(){
 ###############################
 isRunning(){
 	RET=0
-        RET=`ps -ef | grep "/usr/sbin/l7directord start" | grep -v grep | wc -l`
+        RET=`pgrep -fox "/usr/sbin/l7directord start" | wc -l`
 	return $RET
 }
 
@@ -121,7 +121,7 @@ isRunning(){
 # Flush Virtual Service Method
 ###############################
 l7vsd_flush(){
-        PS=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
+        PS=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
         if [ $PS -eq 1 ]; then
                   ocf_log info "[l7vsadm]: flush virtual service!"
                   l7vsadm -C

--- a/doc/heartbeat-ra/L7vsd
+++ b/doc/heartbeat-ra/L7vsd
@@ -162,7 +162,7 @@ l7vsd_pkill(){
 ###############################
 isRunning(){
 	RET=0
-	RET=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
+	RET=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
 	return $RET
 }
 

--- a/doc/heartbeat-ra/README
+++ b/doc/heartbeat-ra/README
@@ -18,3 +18,30 @@ http://sourceforge.jp/projects/ultramonkey-l7/docs/?category_id=964
 
 You can use Resource Agents as they are.  But you must edit at
 least IP addresses in configuration files.
+
+When you edit the init script "l7vsd" as follows, you must edit
+the Resource Agent "L7vsd" and "L7directord" as described later.
+
+  [init script "l7vsd"]
+  -----------------------------------------------------------------
+    <default>       L7VSD_OPTIONS="-b"    # run as blocking mode
+
+    <after edit>    L7VSD_OPTIONS=""      # run as non-blocking mode
+  -----------------------------------------------------------------
+
+  [Resource Agent "L7directord"]
+   at the function "l7vsd_flush()"
+  -----------------------------------------------------------------
+    <default>       PS=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
+
+    <after edit>    PS=`pgrep -fox "/usr/sbin/l7vsd" | wc -l`
+  -----------------------------------------------------------------
+
+  [Resource Agent "L7vsd"]
+   at the function "isRunning()"
+  -----------------------------------------------------------------
+    <default>       RET=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
+
+    <after edit>    RET=`pgrep -fox "/usr/sbin/l7vsd" | wc -l`
+  -----------------------------------------------------------------
+

--- a/doc/heartbeat-ra/SSLProxy
+++ b/doc/heartbeat-ra/SSLProxy
@@ -108,7 +108,7 @@ sslproxy_pkill(){
 ###############################
 isRunning(){
 	RET=0
-	RET=`ps -ef | grep "/usr/sbin/sslproxy" | grep -v grep | wc -l`
+	RET=`pgrep -fox '/usr/sbin/sslproxy .*' | wc -l`
 	return $RET
 }
 

--- a/init.d/l7vsd.sh
+++ b/init.d/l7vsd.sh
@@ -10,6 +10,10 @@
 # Released: January 2008
 # Licence: GNU General Public Licence
 
+
+# If you change L7VSD_OPTIONS, you must edit Resource Agents.
+# Please read "doc/heartbeat-ra/README" in detail.
+#
 #L7VSD_OPTIONS=""		# run as non-blocking mode
 L7VSD_OPTIONS="-b"		# run as blocking mode