Commit: 3c363b86dad5fffc69c1d5e1d772aa67659f2936 - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revision: 3c363b86dad5fffc69c1d5e1d772aa67659f2936 (tree)
• Time: 2014-02-07 15:04:34
• Author: Hiroaki Nakano <nakano.hiroaki@nttc...>
• Commiter: Hiroaki Nakano

Log Message

Merge branch 'ra-loglevel-modify' of git.sourceforge.jp:/gitroot/ultramonkey-l7/ultramonkey-l7-v3 into v3.1.1-devel

Change Summary

• modified: doc/heartbeat-ra/L7directord
• modified: doc/heartbeat-ra/L7vsd

Incremental Difference

--- a/doc/heartbeat-ra/L7directord
+++ b/doc/heartbeat-ra/L7directord
@@ -145,6 +145,12 @@ l7directord_status(){
 # Get Resource Monitor Method
 ###############################
 l7directord_monitor() {
+	local loglevel
+	loglevel=${1:-err}
+	if ocf_is_probe; then
+		loglevel="info"
+	fi
+
 	isRunning;
 	RET=$?
 	if [ $RET -eq 1 ]; then
@@ -158,7 +164,7 @@ l7directord_monitor() {
 		fi
 	elif [ $RET -eq 0 ]; then
 		MSG="l7direcotrd is not running."
-		outputLog err ${OCF_NOT_RUNNING} ${MSG}
+		outputLog $loglevel ${OCF_NOT_RUNNING} ${MSG}
 		return ${OCF_NOT_RUNNING}
 	fi
 	MSG="l7direcotrd does not work. (ps=$RET) "
@@ -171,7 +177,7 @@ l7directord_monitor() {
 ###############################
 l7directord_start() {
 	outputLog info "l7directord is starting ..."
-	l7directord_monitor
+	l7directord_monitor info
 	RET=$?
 	if [ $RET -eq ${OCF_SUCCESS} ]; then
 		MSG="l7directord is already running."

--- a/doc/heartbeat-ra/L7vsd
+++ b/doc/heartbeat-ra/L7vsd
@@ -67,7 +67,7 @@ END
 ###############################
 l7vsd_start() {
         ocf_log info "l7vsd is starting ..."
-        l7vsd_monitor
+        l7vsd_monitor info
         RET=$?
         if [ $RET -eq $OCF_SUCCESS ]; then
                 ocf_log info "l7vsd is already running."
@@ -182,6 +182,12 @@ l7vsd_status(){
 # Get Resource Monitor Method
 ###############################
 l7vsd_monitor() {
+	local loglevel
+	loglevel=${1:-err}
+	if ocf_is_probe; then
+		loglevel="info"
+	fi
+
 	isRunning;
 	RET=$?
 	if [ $RET -eq 1 ]; then
@@ -195,7 +201,7 @@ l7vsd_monitor() {
 		fi
 	elif [ $RET -eq 0 ]; then
 		MSG="l7vsd is not running."
-		outputLog err ${OCF_NOT_RUNNING} ${MSG}
+		outputLog $loglevel ${OCF_NOT_RUNNING} ${MSG}
 		return $OCF_NOT_RUNNING
 	fi
 	MSG="l7vsd does not work. (ps=$RET) "