• R/O
  • HTTP
  • SSH
  • HTTPS

ultramonkey-l7-v2: コミット

UltraMonkey-L7 V2(single-thread implementation)


コミットメタ情報

リビジョン588c9b80c356a422277fd1937ed0b1a5b52777da (tree)
日時2010-06-15 17:41:48
作者Jun Sugiura <jsugiura@user...>
コミッターJun Sugiura

ログメッセージ

Fix Resource Agents for HBv2

変更サマリ

差分

--- a/doc/heartbeat-ra/L7directord
+++ b/doc/heartbeat-ra/L7directord
@@ -109,7 +109,7 @@ l7directord_pkill(){
109109 ###############################
110110 isRunning(){
111111 RET=0
112- RET=`ps -ef | grep "/usr/sbin/l7directord start" | grep -v grep | wc -l`
112+ RET=`pgrep -fox "/usr/sbin/l7directord start" | wc -l`
113113 return $RET
114114 }
115115
@@ -118,7 +118,7 @@ isRunning(){
118118 # Flush Virtual Service Method
119119 ###############################
120120 l7vsd_flush(){
121- PS=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
121+ PS=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
122122 if [ $PS -eq 1 ]; then
123123 ocf_log info "[l7vsadm]: flush virtual service!"
124124 l7vsadm -C
--- a/doc/heartbeat-ra/L7vsd
+++ b/doc/heartbeat-ra/L7vsd
@@ -159,7 +159,7 @@ l7vsd_pkill(){
159159 ###############################
160160 isRunning(){
161161 RET=0
162- RET=`ps -ef | grep /usr/sbin/l7vsd | grep -v grep | wc -l`
162+ RET=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
163163 return $RET
164164 }
165165
--- a/doc/heartbeat-ra/README
+++ b/doc/heartbeat-ra/README
@@ -18,3 +18,30 @@ http://sourceforge.jp/projects/ultramonkey-l7/docs/?category_id=964
1818
1919 You can use Resource Agents as they are. But you must edit at
2020 least IP addresses in configuration files.
21+
22+When you edit the init script "l7vsd" as follows, you must edit
23+the Resource Agent "L7vsd" and "L7directord" as described later.
24+
25+ [init script "l7vsd"]
26+ -----------------------------------------------------------------
27+ <default> L7VSD_OPTIONS="-b" # run as blocking mode
28+
29+ <after edit> L7VSD_OPTIONS="" # run as non-blocking mode
30+ -----------------------------------------------------------------
31+
32+ [Resource Agent "L7directord"]
33+ at the function "l7vsd_flush()"
34+ -----------------------------------------------------------------
35+ <default> PS=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
36+
37+ <after edit> PS=`pgrep -fox "/usr/sbin/l7vsd" | wc -l`
38+ -----------------------------------------------------------------
39+
40+ [Resource Agent "L7vsd"]
41+ at the function "isRunning()"
42+ -----------------------------------------------------------------
43+ <default> RET=`pgrep -fox "/usr/sbin/l7vsd -b" | wc -l`
44+
45+ <after edit> RET=`pgrep -fox "/usr/sbin/l7vsd" | wc -l`
46+ -----------------------------------------------------------------
47+
--- a/doc/heartbeat-ra/SSLProxy
+++ b/doc/heartbeat-ra/SSLProxy
@@ -105,7 +105,7 @@ sslproxy_pkill(){
105105 ###############################
106106 isRunning(){
107107 RET=0
108- RET=`ps -ef | grep "/usr/sbin/sslproxy" | grep -v grep | wc -l`
108+ RET=`pgrep -fox '/usr/sbin/sslproxy .*' | wc -l`
109109 return $RET
110110 }
111111
--- a/init.d/l7vsd
+++ b/init.d/l7vsd
@@ -10,6 +10,10 @@
1010 # Released: January 2008
1111 # Licence: GNU General Public Licence
1212
13+
14+# If you change L7VSD_OPTIONS, you must edit Resource Agents.
15+# Please read "doc/heartbeat-ra/README" in detail.
16+#
1317 #L7VSD_OPTIONS="" # run as non-blocking mode
1418 L7VSD_OPTIONS="-b" # run as blocking mode
1519
旧リポジトリブラウザで表示