Commit: ecd02872c6f427f01cb27bf90d73fa4a1e2f429d - ultramonkey-l7-v3 (git)

UltraMonkey-L7 V3(multi-thread implementation)

Commit MetaInfo

• Revisión: ecd02872c6f427f01cb27bf90d73fa4a1e2f429d (tree)
• Tiempo: 2013-12-24 10:15:53
• Autor: Michiro Hibari <l05102@shib...>
• Commiter: Michiro Hibari

Log Message

Change of the output level of the log of the resource agents.

The resource agents of L7vsd and L7directord outputs error log
every time in probe,start.

Dec 20 15:44:19 LB01 L7directord(prmL7directord)[9900]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7directord monitor] NG;return=7 l7direcotrd is not running.
Dec 20 15:44:19 LB01 L7vsd(prmL7vsd:0)[9913]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7vsd monitor] NG;return=7 l7vsd is not running.
Dec 20 15:44:24 LB01 L7vsd(prmL7vsd:0)[9984]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7vsd start] NG;return=7 l7vsd is not running.
Dec 20 15:44:34 LB01 L7directord(prmL7directord)[10963]: ERROR: [/usr/lib/ocf/resource.d//heartbeat/L7directord start] NG;return=7 l7direcotrd is not running.

When a resource does not start, the resource agent changes the level of the log and should output it.

Cambiar Resumen

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

Diferencia incremental

--- 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) "