Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
To subscribe or unsubscribe via the World Wide Web, visit
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
or, via email, send a message with subject or body 'help' to
[EMAIL PROTECTED]
You can reach the person managing the list at
[EMAIL PROTECTED]
When replying, please edit your Subject line so it is more specific
than "Re: Contents of Linux-ha-cvs digest..."
Today's Topics:
1. Linux-HA CVS: lrm by sunjd from (linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: linux-ha by lars from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 20 Jun 2006 04:40:03 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: lrm by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lrm
Dir : linux-ha/lrm/lrmd
Modified Files:
lrmd.c
Log Message:
Make debug log output the real operation parameters
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lrm/lrmd/lrmd.c,v
retrieving revision 1.227
retrieving revision 1.228
diff -u -3 -r1.227 -r1.228
--- lrmd.c 20 Jun 2006 09:11:34 -0000 1.227
+++ lrmd.c 20 Jun 2006 10:40:03 -0000 1.228
@@ -1,4 +1,4 @@
-/* $Id: lrmd.c,v 1.227 2006/06/20 09:11:34 sunjd Exp $ */
+/* $Id: lrmd.c,v 1.228 2006/06/20 10:40:03 sunjd Exp $ */
/*
* Local Resource Manager Daemon
*
@@ -3771,7 +3771,13 @@
lrmd_rsc_t* rsc = NULL;
const char * op_type;
GString * param_gstr;
+ GHashTable* op_params = NULL;
+ if (NULL == op) {
+ lrmd_log(LOG_ERR, "%s:%d: op==NULL"
+ , __FUNCTION__, __LINE__);
+ return NULL;
+ }
rsc = lookup_rsc(op->rsc_id);
op_type = ha_msg_value(op->msg, F_LRM_OP);
@@ -3784,7 +3790,10 @@
}else{
param_gstr = g_string_new("");
- hash_to_str(rsc->params, param_gstr);
+ op_params = ha_msg_value_str_table(op->msg, F_LRM_PARAM);
+ hash_to_str(op_params, param_gstr);
+ free_str_table(op_params);
+ op_params = NULL;
snprintf(info, sizeof(info)
,"operation %s[%d] on %s::%s::%s for client %d, its parameters:
%s"
@@ -3840,6 +3849,9 @@
}
/*
* $Log: lrmd.c,v $
+ * Revision 1.228 2006/06/20 10:40:03 sunjd
+ * Make debug log output the real operation parameters
+ *
* Revision 1.227 2006/06/20 09:11:34 sunjd
* BEAM: add a check for memory allocation
*
------------------------------
Message: 2
Date: Tue, 20 Jun 2006 06:15:54 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by lars from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : lars
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
heartbeat.spec.in
Log Message:
OSDL #1239: RPM unconditionally included files which were only present
when mgmtd was build.
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/heartbeat.spec.in,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -3 -r1.177 -r1.178
--- heartbeat.spec.in 19 Jun 2006 19:36:48 -0000 1.177
+++ heartbeat.spec.in 20 Jun 2006 12:15:53 -0000 1.178
@@ -1,7 +1,9 @@
-# $Id: heartbeat.spec.in,v 1.177 2006/06/19 19:36:48 alan Exp $
+# $Id: heartbeat.spec.in,v 1.178 2006/06/20 12:15:53 lars Exp $
%define _unpackaged_files_terminate_build 1
%define _missing_doc_files_terminate_build 1
+%define ENABLE_MGMT @MGMT_ENABLED@
+%define ENABLE_SNMP_SUBAGENT @RPM_ENABLE_SNMP_SUBAGENT@
Summary: @HB_PKG@ - The Heartbeat Subsystem for High-Availability Linux
Name: @HB_PKG@
@@ -1173,9 +1175,11 @@
(
cd [EMAIL PROTECTED]@/ha.d/resource.d
ln -s @sbindir@/ldirectord ldirectord
- ln -s @libdir@/heartbeat/haclient.py [EMAIL PROTECTED]@/hb_gui
)
+%if %{ENABLE_MGMT}
+ln -s @libdir@/heartbeat/haclient.py [EMAIL PROTECTED]@/hb_gui
+%endif
###########################################################
%files
@@ -1219,7 +1223,6 @@
%dir @localstatedir@/run/@HB_PKG@
%attr (2555, @HA_CCMUSER@, @HA_APIGROUP@) @bindir@/cl_status
@bindir@/cl_respawn
[EMAIL PROTECTED]@/hb_gui
@sbindir@/crmadmin
@sbindir@/cibadmin
@sbindir@/ccm_tool
@@ -1250,17 +1253,16 @@
%doc @mandir@/man8/ha_logd.8*
%doc @mandir@/man8/cibadmin.8*
%doc @docdir@
-%define ENABLE_SNMP_SUBAGENT @RPM_ENABLE_SNMP_SUBAGENT@
%if %{ENABLE_SNMP_SUBAGENT}
@MIBS_DIR@/LINUX-HA-MIB.mib
%endif
-%define ENABLE_MGMT @MGMT_ENABLED@
%if %{ENABLE_MGMT}
@libdir@/libhbmgmt.*
@libdir@/libhbmgmtclient.*
@libdir@/libhbmgmtcommon.*
@libdir@/libhbmgmttls.*
/etc/pam.d/hbmgmtd
+ @bindir@/hb_gui
/usr/share/locale/zh_CN/LC_MESSAGES/haclient.mo
%endif
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 31, Issue 65
********************************************
