[Cluster-devel] cluster/rgmanager ChangeLog src/resources/clus ...
lhh at sourceware.org
lhh at sourceware.org
Thu Apr 19 19:53:42 UTC 2007
CVSROOT: /cvs/cluster
Module name: cluster
Branch: RHEL5
Changes by: lhh at sourceware.org 2007-04-19 20:53:41
Modified files:
rgmanager : ChangeLog
rgmanager/src/resources: clusterfs.sh
Log message:
Apply patch from Simone Gotti to fix logging errors in clusterfs.sh
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/ChangeLog.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.31.2.2&r2=1.31.2.3
http://sourceware.org/cgi-bin/cvsweb.cgi/cluster/rgmanager/src/resources/clusterfs.sh.diff?cvsroot=cluster&only_with_tag=RHEL5&r1=1.15&r2=1.15.2.1
--- cluster/rgmanager/ChangeLog 2007/04/19 18:05:36 1.31.2.2
+++ cluster/rgmanager/ChangeLog 2007/04/19 19:53:40 1.31.2.3
@@ -3,6 +3,8 @@
Mirkin to fix bug #237144; prevents exclusive services from
being accidentally (or intentionally) being started on the
same node
+ * src/resources/clusterfs.sh: Fix logging in clusterfs.sh
+ Patch from Simone Gotti
2007-04-12 Lon Hohberger <lhh at redhat.com>
* src/daemons/main.c: Fix watchdog race condition causing
--- cluster/rgmanager/src/resources/clusterfs.sh 2006/10/25 15:38:55 1.15
+++ cluster/rgmanager/src/resources/clusterfs.sh 2007/04/19 19:53:41 1.15.2.1
@@ -354,7 +354,7 @@
typeset junk
if [ $# -ne 2 ]; then
- logAndPrint $LOG_ERR "Usage: mountInUse device mount_point".
+ ocf_log err "Usage: mountInUse device mount_point".
return $FAIL
fi
@@ -432,14 +432,14 @@
declare rw
if [ $# -ne 1 ]; then
- logAndPrint $LOG_ERR "Usage: isAlive mount_point"
+ ocf_log err "Usage: isAlive mount_point"
return $FAIL
fi
mount_point=$1
test -d $mount_point
if [ $? -ne 0 ]; then
- logAndPrint $LOG_ERR "$mount_point is not a directory"
+ ocf_log err "$mount_point is not a directory"
return $FAIL
fi
@@ -726,7 +726,7 @@
#
# Mount the device
#
- logAndPrint $LOG_DEBUG "mount $fstype_option $mount_options $dev $mp"
+ ocf_log debug "mount $fstype_option $mount_options $dev $mp"
mount $fstype_option $mount_options $dev $mp
ret_val=$?
if [ $ret_val -ne 0 ]; then
More information about the Cluster-devel
mailing list