From 49546dca4dc4e19743d01576a954eac990c0cde1 Mon Sep 17 00:00:00 2001

From: David Vossel <dvossel@redhat.com>

Date: Mon, 25 Aug 2014 15:35:45 -0500

Subject: [PATCH 4/4] exit reason string support for the following agents

CTDB

Delay

Filesystem

IPsrcaddr

LVM

MailTo

Route

SendArp

Squid

Xinetd

apache

clvm

conntrackd

dhcpd

galera

mysql

mysql-common.sh

named

pgsql

postfix

rsyncd

slapd

symlink

tomcat

---

 heartbeat/CTDB            | 24 ++++++++---------

 heartbeat/Delay           |  2 +-

 heartbeat/Filesystem      | 32 +++++++++++-----------

 heartbeat/IPsrcaddr       | 14 +++++-----

 heartbeat/LVM             | 32 +++++++++++-----------

 heartbeat/MailTo          |  4 +--

 heartbeat/Route           | 16 +++++------

 heartbeat/SendArp         |  4 +--

 heartbeat/Squid           | 14 +++++-----

 heartbeat/Xinetd          | 12 ++++-----

 heartbeat/apache          | 16 +++++------

 heartbeat/clvm            | 14 +++++-----

 heartbeat/conntrackd      | 14 +++++-----

 heartbeat/dhcpd           | 24 ++++++++---------

 heartbeat/galera          | 26 +++++++++---------

 heartbeat/mysql           | 26 +++++++++---------

 heartbeat/mysql-common.sh | 16 +++++------

 heartbeat/named           | 16 +++++------

 heartbeat/pgsql           | 68 +++++++++++++++++++++++------------------------

 heartbeat/postfix         | 22 +++++++--------

 heartbeat/rsyncd          | 16 +++++------

 heartbeat/slapd           | 24 ++++++++---------

 heartbeat/symlink         | 12 ++++-----

 heartbeat/tomcat          | 16 +++++------

 24 files changed, 232 insertions(+), 232 deletions(-)

 mode change 100644 => 100755 heartbeat/clvm

 mode change 100644 => 100755 heartbeat/galera

 mode change 100644 => 100755 heartbeat/mysql-common.sh

diff --git a/heartbeat/CTDB b/heartbeat/CTDB

index 18e6d0f..d1e8d03 100755

--- a/heartbeat/CTDB

+++ b/heartbeat/CTDB

@@ -520,7 +520,7 @@ ctdb_start() {

 	mkdir -p $persistent_db_dir 2>/dev/null

 	for pdbase in $(ls $persistent_db_dir/*.tdb.[0-9] 2>/dev/null$) ; do

 		/usr/bin/tdbdump $pdbase >/dev/null 2>/dev/null || {

-			ocf_log err "Persistent database $pdbase is corrupted!  CTDB will not start."

+			ocf_exit_reason "Persistent database $pdbase is corrupted!  CTDB will not start."

 			return $OCF_ERR_GENERIC

 		}

 	done

@@ -528,7 +528,7 @@ ctdb_start() {

 	# Add necessary configuration to smb.conf

 	init_smb_conf

 	if [ $? -ne 0 ]; then

-		ocf_log err "Failed to update $OCF_RESKEY_smb_conf."

+		ocf_exit_reason "Failed to update $OCF_RESKEY_smb_conf."

 		return $OCF_ERR_GENERIC

 	fi

@@ -563,7 +563,7 @@ ctdb_start() {

 		# cleanup smb.conf

 		cleanup_smb_conf

-		ocf_log err "Failed to execute $OCF_RESKEY_ctdbd_binary."

+		ocf_exit_reason "Failed to execute $OCF_RESKEY_ctdbd_binary."

 		return $OCF_ERR_GENERIC

 	else

 		# Wait a bit for CTDB to stabilize

@@ -577,7 +577,7 @@ ctdb_start() {

 			if [ $? -ne 0 ]; then

 				# CTDB will be running, kill it before returning

 				ctdb_stop

-				ocf_log err "Can't invoke $OCF_RESKEY_ctdb_binary --socket=$OCF_RESKEY_ctdb_socket status"

+				ocf_exit_reason "Can't invoke $OCF_RESKEY_ctdb_binary --socket=$OCF_RESKEY_ctdb_socket status"

 				return $OCF_ERR_GENERIC

 			fi

 			if ! echo $status | grep -qs 'UNHEALTHY (THIS'; then

@@ -593,7 +593,7 @@ ctdb_start() {

 	# ctdbd will (or can) actually still be running at this point, so kill it

 	ctdb_stop

-	ocf_log err "Timeout waiting for CTDB to stabilize"

+	ocf_exit_reason "Timeout waiting for CTDB to stabilize"

 	return $OCF_ERR_GENERIC

 }

@@ -646,7 +646,7 @@ ctdb_monitor() {

 		if echo $status | grep -qs 'Connection refused'; then

 			return $OCF_NOT_RUNNING

 		else

-			ocf_log err "CTDB status call failed: $status"

+			ocf_exit_reason "CTDB status call failed: $status"

 			return $OCF_ERR_GENERIC

 		fi

 	fi

@@ -654,7 +654,7 @@ ctdb_monitor() {

 		return $OCF_SUCCESS

 	fi

-	ocf_log err "CTDB status is bad: $status"

+	ocf_exit_reason "CTDB status is bad: $status"

 	return $OCF_ERR_GENERIC

 }

@@ -667,12 +667,12 @@ ctdb_validate() {

 	done

 	if [ -z "$CTDB_SYSCONFIG" ]; then

-		ocf_log err "Can't find CTDB config file (expecting /etc/sysconfig/ctdb, /etc/default/ctdb or similar)"

+		ocf_exit_reason "Can't find CTDB config file (expecting /etc/sysconfig/ctdb, /etc/default/ctdb or similar)"

 		return $OCF_ERR_INSTALLED

 	fi

 	if ocf_is_true "$OCF_RESKEY_ctdb_manages_samba" && [ ! -f "$OCF_RESKEY_smb_conf" ]; then

-		ocf_log err "Samba config file '$OCF_RESKEY_smb_conf' does not exist."

+		ocf_exit_reason "Samba config file '$OCF_RESKEY_smb_conf' does not exist."

 		return $OCF_ERR_INSTALLED

 	fi

@@ -681,19 +681,19 @@ ctdb_validate() {

 	fi

 	if [ ! -f "$OCF_RESKEY_ctdb_config_dir/nodes" ]; then

-		ocf_log err "$OCF_RESKEY_ctdb_config_dir/nodes does not exist."

+		ocf_exit_reason "$OCF_RESKEY_ctdb_config_dir/nodes does not exist."

 		return $OCF_ERR_ARGS

 	fi

 	if [ -z "$OCF_RESKEY_ctdb_recovery_lock" ]; then

-		ocf_log err "ctdb_recovery_lock not specified."

+		ocf_exit_reason "ctdb_recovery_lock not specified."

 		return $OCF_ERR_CONFIGURED

 	fi

 	lock_dir=$(dirname "$OCF_RESKEY_ctdb_recovery_lock")

 	touch "$lock_dir/$$" 2>/dev/null

 	if [ $? != 0 ]; then

-		ocf_log err "Directory for lock file '$OCF_RESKEY_ctdb_recovery_lock' does not exist, or is not writable."

+		ocf_exit_reason "Directory for lock file '$OCF_RESKEY_ctdb_recovery_lock' does not exist, or is not writable."

 		return $OCF_ERR_ARGS

 	fi

 	rm "$lock_dir/$$"

diff --git a/heartbeat/Delay b/heartbeat/Delay

index f505391..9cfa939 100755

--- a/heartbeat/Delay

+++ b/heartbeat/Delay

@@ -184,7 +184,7 @@ Delay_Validate_All() {

 # _Return_ on validation success

 	return $OCF_SUCCESS

   else

-	echo "Some of the instance parameters are invalid"

+	ocf_exit_reason "Some of the instance parameters are invalid"

 # _Exit_ on validation failure

 	exit $OCF_ERR_ARGS

   fi

diff --git a/heartbeat/Filesystem b/heartbeat/Filesystem

index 9892b39..3559c93 100755

--- a/heartbeat/Filesystem

+++ b/heartbeat/Filesystem

@@ -480,7 +480,7 @@ fstype_supported()

 	# check the if the filesystem support exists again.

 	$MODPROBE $support >/dev/null

 	if [ $? -ne 0 ]; then

-		ocf_log err "Couldn't find filesystem $FSTYPE in /proc/filesystems and failed to load kernal module"

+		ocf_exit_reason "Couldn't find filesystem $FSTYPE in /proc/filesystems and failed to load kernal module"

 		return $OCF_ERR_INSTALLED

 	fi

@@ -497,7 +497,7 @@ fstype_supported()

 		sleep 1

 	done

-	ocf_log err "Couldn't find filesystem $FSTYPE in /proc/filesystems"

+	ocf_exit_reason "Couldn't find filesystem $FSTYPE in /proc/filesystems"

 	return $OCF_ERR_INSTALLED

 }

@@ -532,7 +532,7 @@ Filesystem_start()

 	if [ $blockdevice = "yes" ]; then

 		if [ "$DEVICE" != "/dev/null" -a ! -b "$DEVICE" ] ; then

-			ocf_log err "Couldn't find device [$DEVICE]. Expected /dev/??? to exist"

+			ocf_exit_reason "Couldn't find device [$DEVICE]. Expected /dev/??? to exist"

 			exit $OCF_ERR_INSTALLED

 		fi

@@ -547,7 +547,7 @@ Filesystem_start()

 			# NOTE: if any errors at all are detected, it returns non-zero

 			# if the error is >= 4 then there is a big problem

 			if [ $? -ge 4 ]; then

-				ocf_log err "Couldn't sucessfully fsck filesystem for $DEVICE"

+				ocf_exit_reason "Couldn't sucessfully fsck filesystem for $DEVICE"

 				return $OCF_ERR_GENERIC

 			fi

 		fi

@@ -556,7 +556,7 @@ Filesystem_start()

 	[ -d "$MOUNTPOINT" ] ||

 		ocf_run mkdir -p $MOUNTPOINT

 	if [ ! -d "$MOUNTPOINT" ] ; then

-		ocf_log err "Couldn't find directory  [$MOUNTPOINT] to use as a mount point"

+		ocf_exit_reason "Couldn't find directory  [$MOUNTPOINT] to use as a mount point"

 		exit $OCF_ERR_INSTALLED

 	fi

@@ -571,7 +571,7 @@ Filesystem_start()

 	esac

 	if [ $? -ne 0 ]; then

-		ocf_log err "Couldn't mount filesystem $DEVICE on $MOUNTPOINT"

+		ocf_exit_reason "Couldn't mount filesystem $DEVICE on $MOUNTPOINT"

 		if [ -n "$OCFS2_SLES10" ]; then

 			ocfs2_cleanup

 		fi

@@ -775,7 +775,7 @@ fs_stop() {

 		while [ $cnt -gt 0 ]; do

 			try_umount $SUB &&

 				return $OCF_SUCCESS

-			ocf_log err "Couldn't unmount $SUB; trying cleanup with $sig"

+			ocf_exit_reason "Couldn't unmount $SUB; trying cleanup with $sig"

 			signal_processes $SUB $sig

 			cnt=$((cnt-1))

 			sleep 1

@@ -826,7 +826,7 @@ Filesystem_stop()

 			fs_stop $SUB $timeout

 			rc=$?

 			if [ $rc -ne $OCF_SUCCESS ]; then

-				ocf_log err "Couldn't unmount $SUB, giving up!"

+				ocf_exit_reason "Couldn't unmount $SUB, giving up!"

 			fi

 		done

 	fi

@@ -893,7 +893,7 @@ Filesystem_monitor_10()

 	dd_opts="iflag=direct bs=4k count=1"

 	err_output=`dd if=$DEVICE $dd_opts 2>&1 >/dev/null`

 	if [ $? -ne 0 ]; then

-		ocf_log err "Failed to read device $DEVICE"

+		ocf_exit_reason "Failed to read device $DEVICE"

 		ocf_log err "dd said: $err_output"

 		return $OCF_ERR_GENERIC

 	fi

@@ -916,18 +916,18 @@ Filesystem_monitor_20()

 	[ -d "$status_dir" ] || mkdir -p "$status_dir"

 	err_output=`echo "${OCF_RESOURCE_INSTANCE}" | dd of=${STATUSFILE} $dd_opts 2>&1`

 	if [ $? -ne 0 ]; then

-		ocf_log err "Failed to write status file ${STATUSFILE}"

+		ocf_exit_reason "Failed to write status file ${STATUSFILE}"

 		ocf_log err "dd said: $err_output"

 		return $OCF_ERR_GENERIC

 	fi

 	test -f ${STATUSFILE}

 	if [ $? -ne 0 ]; then

-		ocf_log err "Cannot stat the status file ${STATUSFILE}"

+		ocf_exit_reason "Cannot stat the status file ${STATUSFILE}"

 		return $OCF_ERR_GENERIC

 	fi

 	cat ${STATUSFILE} > /dev/null

 	if [ $? -ne 0 ]; then

-		ocf_log err "Cannot read the status file ${STATUSFILE}"

+		ocf_exit_reason "Cannot read the status file ${STATUSFILE}"

 		return $OCF_ERR_GENERIC

 	fi

 	return $OCF_SUCCESS

@@ -945,7 +945,7 @@ Filesystem_monitor()

 		10) Filesystem_monitor_10; rc=$?;;

 		20) Filesystem_monitor_20; rc=$?;;

 		*)

-			ocf_log err "unsupported monitor level $OCF_CHECK_LEVEL"

+			ocf_exit_reason "unsupported monitor level $OCF_CHECK_LEVEL"

 			rc=$OCF_ERR_CONFIGURED

 		;;

 		esac

@@ -1057,7 +1057,7 @@ case $OP in

 esac

 if [ x = x"$DEVICE" ]; then

-	ocf_log err "Please set OCF_RESKEY_device to the device to be managed"

+	ocf_exit_reason "Please set OCF_RESKEY_device to the device to be managed"

 	exit $OCF_ERR_CONFIGURED

 fi

@@ -1069,7 +1069,7 @@ set_blockdevice_var

 # But the output of `mount` and /proc/mounts do not.

 if [ -z "$OCF_RESKEY_directory" ]; then

 	if [ X$OP = "Xstart" -o $blockdevice = "no" ]; then

-		ocf_log err "Please specify the directory"

+		ocf_exit_reason "Please specify the directory"

 		exit $OCF_ERR_CONFIGURED 

 	fi

 else

@@ -1136,7 +1136,7 @@ esac

 if [ -n "$OCF_RESKEY_CRM_meta_clone" ]; then

 	case $CLUSTERSAFE in

 	0)

-		ocf_log err "DANGER! $FSTYPE on $DEVICE is NOT cluster-aware!"

+		ocf_exit_reason "DANGER! $FSTYPE on $DEVICE is NOT cluster-aware!"

 		ocf_log err "DO NOT RUN IT AS A CLONE!"

 		ocf_log err "Politely refusing to proceed to avoid data corruption."

 		exit $OCF_ERR_CONFIGURED

diff --git a/heartbeat/IPsrcaddr b/heartbeat/IPsrcaddr

index e8c0f77..8163c0c 100755

--- a/heartbeat/IPsrcaddr

+++ b/heartbeat/IPsrcaddr

@@ -111,7 +111,7 @@ END

 }

 errorexit() {

-	ocf_log err "$*"

+	ocf_exit_reason "$*"

 	exit $OCF_ERR_GENERIC

 }

@@ -253,7 +253,7 @@ CheckIP() {

 	    ( [ $1 -le 254 ] && [ $2 -le 254 ] && [ $3 -le 254 ] && [ $4 -le 254 ] )

 	then

 	    if [ $1 -eq 127 ]; then

-		ocf_log err "IP address [$ip] is a loopback address, thus can not be preferred source address"

+		ocf_exit_reason "IP address [$ip] is a loopback address, thus can not be preferred source address"

 		exit $OCF_ERR_CONFIGURED

 	    fi

 	else

@@ -368,7 +368,7 @@ ip_status() {

 	  case $IF in

 	  	lo*)  

-		    ocf_log err "IP address [$BASEIP] is served by loopback, thus can not be preferred source address"

+		    ocf_exit_reason "IP address [$BASEIP] is served by loopback, thus can not be preferred source address"

 		    exit $OCF_ERR_CONFIGURED

 		    ;;

 		*)return $OCF_SUCCESS;;

@@ -394,7 +394,7 @@ srca_validate_all() {

 	if CheckIP "$ipaddress"; then

 	  : 

 	else

-	  ocf_log err "Invalid IP address [$ipaddress]"

+	  ocf_exit_reason "Invalid IP address [$ipaddress]"

 	  exit $OCF_ERR_CONFIGURED

 	fi

@@ -406,7 +406,7 @@ srca_validate_all() {

 	if ip_status "$ipaddress"; then

 	  :

 	else

-	  ocf_log err "We are not serving [$ipaddress], hence can not make it a preferred source address"

+	  ocf_exit_reason "We are not serving [$ipaddress], hence can not make it a preferred source address"

 	  exit $OCF_ERR_INSTALLED

 	fi

 }

@@ -434,7 +434,7 @@ if

   [ -z "$OCF_RESKEY_ipaddress" ]

 then

 #  usage

-  ocf_log err "Please set OCF_RESKEY_ipaddress to the preferred source IP address!"

+  ocf_exit_reason "Please set OCF_RESKEY_ipaddress to the preferred source IP address!"

   exit $OCF_ERR_CONFIGURED

 fi

@@ -447,7 +447,7 @@ fi

 findif_out=`$FINDIF -C`

 rc=$?

 [ $rc -ne 0 ] && {

-    ocf_log err "[$FINDIF -C] failed"

+    ocf_exit_reason "[$FINDIF -C] failed"

     exit $rc

 }

diff --git a/heartbeat/LVM b/heartbeat/LVM

index 27cdfbd..58cbe83 100755

--- a/heartbeat/LVM

+++ b/heartbeat/LVM

@@ -183,8 +183,8 @@ verify_tags_environment()

 	# guarantee our tag will be filtered on startup

 	##

 	if ! lvm dumpconfig activation/volume_list; then

-		ocf_log err "LVM: Improper setup detected"

-		ocf_log err "The volume_list filter must be initialized in lvm.conf for exclusive activation without clvmd"

+		ocf_log err  "LVM: Improper setup detected"

+		ocf_exit_reason "The volume_list filter must be initialized in lvm.conf for exclusive activation without clvmd"

 		return $OCF_ERR_GENERIC

 	fi

@@ -195,7 +195,7 @@ verify_tags_environment()

 	##

 	if lvm dumpconfig activation/volume_list | grep -e "\"@$OUR_TAG\"" -e "\"${OCF_RESKEY_volgrpname}\""; then

 		ocf_log err "LVM:  Improper setup detected"

-		ocf_log err "The volume_list in lvm.conf must not contain the cluster tag, \"$OUR_TAG\", or volume group, $OCF_RESKEY_volgrpname"

+		ocf_exit_reason "The volume_list in lvm.conf must not contain the cluster tag, \"$OUR_TAG\", or volume group, $OCF_RESKEY_volgrpname"

 		return $OCF_ERR_GENERIC

 	fi

@@ -283,7 +283,7 @@ strip_tags()

 	done

 	if [ ! -z `vgs -o tags --noheadings $OCF_RESKEY_volgrpname | tr -d ' '` ]; then

-		ocf_log err "Failed to remove ownership tags from $OCF_RESKEY_volgrpname"

+		ocf_exit_reason "Failed to remove ownership tags from $OCF_RESKEY_volgrpname"

 		return $OCF_ERR_GENERIC

 	fi

@@ -310,7 +310,7 @@ set_tags()

 	vgchange --addtag $OUR_TAG $OCF_RESKEY_volgrpname

 	if [ $? -ne 0 ]; then

-		ocf_log err "Failed to add ownership tag to $OCF_RESKEY_volgrpname"

+		ocf_exit_reason "Failed to add ownership tag to $OCF_RESKEY_volgrpname"

 		return $OCF_ERR_GENERIC

 	fi

@@ -341,7 +341,7 @@ LVM_status() {

 		test "`cd /dev/$1 && ls`" != ""

 		rc=$?

 		if [ $rc -ne 0 ]; then

-			ocf_log err "VG $1 with no logical volumes is not supported by this RA!"

+			ocf_exit_reason "VG $1 with no logical volumes is not supported by this RA!"

 		fi

 	fi

@@ -354,7 +354,7 @@ LVM_status() {

 			# If vg is running, make sure the correct tag is present. Otherwise we

 			# can not guarantee exclusive activation.

 			if ! check_tags; then

-				ocf_log err "WARNING: $OCF_RESKEY_volgrpname is active without the cluster tag, \"$OUR_TAG\""

+				ocf_exit_reason "WARNING: $OCF_RESKEY_volgrpname is active without the cluster tag, \"$OUR_TAG\""

 				rc=$OCF_ERR_GENERIC

 			fi

@@ -423,7 +423,7 @@ retry_exclusive_start()

 			return $OCF_ERR_GENERIC;;

 		*)

 			if ! lvchange -an $OCF_RESKEY_volgrpname/$1; then

-				ocf_log err "Unable to perform required deactivation of $OCF_RESKEY_volgrpname/$1 before starting"

+				ocf_exit_reason "Unable to perform required deactivation of $OCF_RESKEY_volgrpname/$1 before starting"

 				return $OCF_ERR_GENERIC

 			fi

 			;;

@@ -482,7 +482,7 @@ LVM_start() {

 		: OK Volume $vg activated just fine!

 		return $OCF_SUCCESS 

 	else

-		ocf_log err "LVM: $vg did not activate correctly"

+		ocf_exit_reason "LVM: $vg did not activate correctly"

 		return $OCF_NOT_RUNNING

 	fi

 }

@@ -511,7 +511,7 @@ LVM_stop() {

 		ocf_run vgchange $vgchange_options $vg

 		res=$?

 		if LVM_status $vg; then

-			ocf_log err "LVM: $vg did not stop correctly"

+			ocf_exit_reason "LVM: $vg did not stop correctly"

 			res=1

 		fi

@@ -568,7 +568,7 @@ LVM_validate_all() {

 	##

 	VGOUT=`vgck ${VOLUME} 2>&1`

 	if [ $? -ne 0 ]; then

-		ocf_log err "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}"

+		ocf_exit_reason "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}"

 		exit $OCF_ERR_GENERIC

 	fi

@@ -581,7 +581,7 @@ LVM_validate_all() {

 		VGOUT=`vgdisplay -v ${VOLUME} 2>&1`

 	fi

 	if [ $? -ne 0 ]; then

-		ocf_log err "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}"

+		ocf_exit_reason "Volume group [$VOLUME] does not exist or contains error! ${VGOUT}"

 		exit $OCF_ERR_GENERIC

 	fi

@@ -597,7 +597,7 @@ LVM_validate_all() {

 	# Having cloned lvm resources with exclusive vg activation makes no sense at all.

 	##

 	if ocf_is_clone; then

-		ocf_log_err "cloned lvm resources can not be activated exclusively"

+		ocf_exit_reason "cloned lvm resources can not be activated exclusively"

 		exit $OCF_ERR_CONFIGURED

 	fi

@@ -616,7 +616,7 @@ LVM_validate_all() {

 		# verify is clvmd running

 		##

 		if ! ps -C clvmd > /dev/null 2>&1; then

-			ocf_log err "$OCF_RESKEY_volgrpname has the cluster attribute set, but 'clvmd' is not running"

+			ocf_exit_reason "$OCF_RESKEY_volgrpname has the cluster attribute set, but 'clvmd' is not running"

 			exit $OCF_ERR_GENERIC

 		fi

 		;;

@@ -653,7 +653,7 @@ esac

 if 

 	[ -z "$OCF_RESKEY_volgrpname" ]

 then

-	ocf_log err "You must identify the volume group name!"

+	ocf_exit_reason "You must identify the volume group name!"

 	exit $OCF_ERR_CONFIGURED 

 fi

@@ -680,7 +680,7 @@ rc=$?

 if

 	( [ $rc -ne 0 ] || [ -z "$LVM_VERSION" ] )

 then

-	ocf_log err "LVM: $1 could not determine LVM version. Try 'vgchange --version' manually and modify $0 ?"

+	ocf_exit_reason "LVM: $1 could not determine LVM version. Try 'vgchange --version' manually and modify $0 ?"

 	exit $OCF_ERR_INSTALLED

 fi

 LVM_MAJOR="${LVM_VERSION%%.*}"

diff --git a/heartbeat/MailTo b/heartbeat/MailTo

index acf6730..3936c39 100755

--- a/heartbeat/MailTo

+++ b/heartbeat/MailTo

@@ -131,7 +131,7 @@ MailToStatus () {

 MailToValidateAll () {

 	if [ -z "$MAILCMD" ]; then

-		ocf_log err "MAILCMD not set: complain to the packager"

+		ocf_exit_reason "MAILCMD not set: complain to the packager"

 		exit $OCF_ERR_INSTALLED

 	fi

 	check_binary "$MAILCMD"

@@ -169,7 +169,7 @@ esac

 if 

   [ -z "$OCF_RESKEY_email" ]

 then

-  ocf_log err "At least 1 Email address has to be given!"

+  ocf_exit_reason "At least 1 Email address has to be given!"

   exit $OCF_ERR_CONFIGURED

 fi

diff --git a/heartbeat/Route b/heartbeat/Route

index 9a49a26..cfed2b0 100755

--- a/heartbeat/Route

+++ b/heartbeat/Route

@@ -174,7 +174,7 @@ route_start() {

 	ocf_log info "${OCF_RESOURCE_INSTANCE} Added network route: $route_spec"

 	return $OCF_SUCCESS

     else

-	ocf_log error "${OCF_RESOURCE_INSTANCE} Failed to add network route: $route_spec"

+	ocf_exit_reason "${OCF_RESOURCE_INSTANCE} Failed to add network route: $route_spec"

     fi

     return $OCF_ERR_GENERIC

 }

@@ -189,7 +189,7 @@ route_stop() {

 		ocf_log info "${OCF_RESOURCE_INSTANCE} Removed network route: $route_spec"

 		return $OCF_SUCCESS

 	    else

-		ocf_log error "${OCF_RESOURCE_INSTANCE} Failed to remove network route: $route_spec"

+		ocf_exit_reason "${OCF_RESOURCE_INSTANCE} Failed to remove network route: $route_spec"

 	    fi

 	    ;;

 	$OCF_NOT_RUNNING)

@@ -224,24 +224,24 @@ route_validate() {

     # If we're running as a clone, are the clone meta attrs OK?

     if [ "${OCF_RESKEY_CRM_meta_clone}" ]; then

 	if [ "${OCF_RESKEY_CRM_meta_clone_node_max}" != 1 ]; then

-	    ocf_log error "Misconfigured clone parameters. Must set meta attribute \"clone_node_max\" to 1, got ${OCF_RESKEY_CRM_meta_clone_node_max}."

+	    ocf_exit_reason "Misconfigured clone parameters. Must set meta attribute \"clone_node_max\" to 1, got ${OCF_RESKEY_CRM_meta_clone_node_max}."

 	    return $OCF_ERR_ARGS

 	fi

     fi

     # Did we get a destination?

     if [ -z "${OCF_RESKEY_destination}" ]; then

-	ocf_log error "Missing required parameter \"destination\"."

+	ocf_exit_reason "Missing required parameter \"destination\"."

 	return $OCF_ERR_ARGS

     fi

     # Did we get either a device or a gateway address?

     if [ -z "${OCF_RESKEY_device}" -a -z "${OCF_RESKEY_gateway}" ]; then

-	ocf_log error "Must specifiy either \"device\", or \"gateway\", or both."

+	ocf_exit_reason "Must specifiy either \"device\", or \"gateway\", or both."

 	return $OCF_ERR_ARGS

     fi

     # If a device has been configured, is it available on this system?

     if [ -n "${OCF_RESKEY_device}" ]; then

 	if ! ip link show ${OCF_RESKEY_device} >/dev/null 2>&1; then

-	    ocf_log error "Network device ${OCF_RESKEY_device} appears not to be available on this system."

+	    ocf_exit_reason "Network device ${OCF_RESKEY_device} appears not to be available on this system."

 	    # OCF_ERR_ARGS prevents the resource from running anywhere at all,

 	    # maybe another node has the interface?

             # OCF_ERR_INSTALLED just prevents starting on this particular node.

@@ -256,7 +256,7 @@ route_validate() {

         # this system?

 	if [ -n "${OCF_RESKEY_source}" ]; then

 	    if ! ip address show | grep -w ${OCF_RESKEY_source} >/dev/null 2>&1; then

-		ocf_log error "Source address ${OCF_RESKEY_source} appears not to be available on this system."

+		ocf_exit_reason "Source address ${OCF_RESKEY_source} appears not to be available on this system."

 	    # same reason as with _device:

 		return $OCF_ERR_INSTALLED

 	    fi

@@ -264,7 +264,7 @@ route_validate() {

         # If a gateway address has been configured, is it reachable?

 	if [ -n "${OCF_RESKEY_gateway}" ]; then

 	    if ! ip route get ${OCF_RESKEY_gateway} >/dev/null 2>&1; then

-		ocf_log error "Gateway address ${OCF_RESKEY_gateway} is unreachable."

+		ocf_exit_reason "Gateway address ${OCF_RESKEY_gateway} is unreachable."

 	    # same reason as with _device:

 		return $OCF_ERR_INSTALLED

 	    fi

diff --git a/heartbeat/SendArp b/heartbeat/SendArp

index 675070c..b67404f 100755

--- a/heartbeat/SendArp

+++ b/heartbeat/SendArp

@@ -166,10 +166,10 @@ sendarp_start() {

 	# and wait-ing would be equal to not running in

 	# background

 	($SENDARP $ARGS ||

-	    ocf_log err "Could not send gratuitous arps") &

+	    ocf_exit_reason "Could not send gratuitous arps") &

     else

 	$SENDARP $ARGS || {

-	    ocf_log err "Could not send gratuitous arps"

+	    ocf_exit_reason "Could not send gratuitous arps"

 	    rc=$OCF_ERR_GENERIC

 	}

     fi

diff --git a/heartbeat/Squid b/heartbeat/Squid

index 28e2db5..70c7c3d 100755

--- a/heartbeat/Squid

+++ b/heartbeat/Squid

@@ -216,7 +216,7 @@ are_pids_sane()

 	if [[ "${SQUID_PIDS[1]}" = "${SQUID_PIDS[2]}" ]]; then

 		return $OCF_SUCCESS

 	else

-		ocf_log err "$SQUID_NAME:Pid unmatch"

+		ocf_exit_reason "$SQUID_NAME:Pid unmatch"

 		return $OCF_ERR_GENERIC

 	fi

 }

@@ -253,7 +253,7 @@ monitor_squid()

 			"${SQUID_PIDS[0]},${SQUID_PIDS[1]},${SQUID_PIDS[2]}"

 		(( trialcount = trialcount + 1 ))

 		if (( trialcount > SQUID_CONFIRM_TRIALCOUNT )); then

-			ocf_log err "$SQUID_NAME:Inconsistency of processes remains unsolved"

+			ocf_exit_reason "$SQUID_NAME:Inconsistency of processes remains unsolved"

 			return $OCF_ERR_GENERIC

 		fi

 		sleep 1

@@ -348,7 +348,7 @@ fi

 SQUID_CONF="${OCF_RESKEY_squid_conf}"

 if [[ -z "$SQUID_CONF" ]]; then

-	ocf_log err "SQUID_CONF is not defined"

+	ocf_exit_reason "SQUID_CONF is not defined"

 	exit $OCF_ERR_CONFIGURED

 fi

@@ -374,23 +374,23 @@ fi

 SQUID_EXE="${OCF_RESKEY_squid_exe}"

 if [[ -z "$SQUID_EXE" ]]; then

-	ocf_log err "SQUID_EXE is not defined"

+	ocf_exit_reason "SQUID_EXE is not defined"

 	exit $OCF_ERR_CONFIGURED

 fi

 if [[ ! -x "$SQUID_EXE" ]]; then

-	ocf_log err "$SQUID_EXE is not found"

+	ocf_exit_reason "$SQUID_EXE is not found"

 	exit $OCF_ERR_CONFIGURED

 fi

 SQUID_PIDFILE="${OCF_RESKEY_squid_pidfile}"

 if [[ -z "$SQUID_PIDFILE" ]]; then

-	ocf_log err "SQUID_PIDFILE is not defined"

+	ocf_exit_reason "SQUID_PIDFILE is not defined"

 	exit $OCF_ERR_CONFIGURED

 fi

 SQUID_PORT="${OCF_RESKEY_squid_port}"

 if [[ -z "$SQUID_PORT" ]]; then

-	ocf_log err "SQUID_PORT is not defined"

+	ocf_exit_reason "SQUID_PORT is not defined"

 	exit $OCF_ERR_CONFIGURED

 fi

diff --git a/heartbeat/Xinetd b/heartbeat/Xinetd

index ee2c4fa..212648e 100755

--- a/heartbeat/Xinetd

+++ b/heartbeat/Xinetd

@@ -89,11 +89,11 @@ hup_inetd () {

 	if kill -s HUP $pid; then

             ocf_log info "asked xinetd to reload by sending SIGHUP to process $pid!"

 	else

-            ocf_log err "could not send SIGHUP to process $pid!"

+            ocf_exit_reason "could not send SIGHUP to process $pid!"

             exit $OCF_ERR_GENERIC

 	fi

     else

-	ocf_log err "xinetd process not found!"

+	ocf_exit_reason "xinetd process not found!"

 	exit $OCF_ERR_GENERIC

     fi

 }

@@ -161,7 +161,7 @@ xup_usage () {

 xup_validate_all () {

     if [ ! -f "$SVCDEF" ]; then

-        ocf_log err "service $service missing $SVCDEF"

+        ocf_exit_reason "service $service missing $SVCDEF"