Send Linux-ha-cvs mailing list submissions to
[email protected]
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: linux-ha by sunjd from
([email protected])
2. Linux-HA CVS: mgmt by zhenh from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 7 Dec 2005 19:52:18 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: linux-ha by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Module : linux-ha
Dir : linux-ha
Modified Files:
configure.in
Log Message:
Add an error message
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/configure.in,v
retrieving revision 1.473
retrieving revision 1.474
diff -u -3 -r1.473 -r1.474
--- configure.in 7 Dec 2005 09:47:32 -0000 1.473
+++ configure.in 8 Dec 2005 02:52:17 -0000 1.474
@@ -10,7 +10,7 @@
AC_INIT(heartbeat.spec.in)
AC_CONFIG_AUX_DIR(.)
-AC_REVISION($Revision: 1.473 $) dnl cvs revision
+AC_REVISION($Revision: 1.474 $) dnl cvs revision
AC_CANONICAL_HOST
@@ -369,7 +369,7 @@
AC_SUBST(STRINGSCMD)
AC_PATH_PROGS(PERL, perl)
AC_SUBST(PERL)
-AC_PATH_PROGS(SWIG, swig)
+AC_PATH_PROGS(SWIG, swig, [swig not found],)
AC_SUBST(SWIG)
AC_PATH_PROGS(EGREP, egrep)
AC_SUBST(EGREP)
------------------------------
Message: 2
Date: Thu, 8 Dec 2005 01:25:51 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Removed Files:
mgmtd.h
Log Message:
rename to mgmt.h
------------------------------
Message: 3
Date: Thu, 8 Dec 2005 01:50:35 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_internal.h
Log Message:
change name of mgmtd_log to mgmt_log
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_internal.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- mgmt_internal.h 7 Dec 2005 05:29:41 -0000 1.2
+++ mgmt_internal.h 8 Dec 2005 08:50:34 -0000 1.3
@@ -29,20 +29,20 @@
#define KEY_LOGDAEMON "use_logd"
#define HADEBUGVAL "HA_DEBUG"
-#define mgmtd_log(priority, fmt...); \
+#define mgmt_log(priority, fmt...); \
cl_log(priority, fmt); \
-#define mgmtd_debug(priority, fmt...); \
+#define mgmt_debug(priority, fmt...); \
if ( debug_level > 0 ) { \
cl_log(priority, fmt); \
}
#define ARGC_CHECK(n); \
if (argc != (n)) { \
- mgmtd_log(LOG_DEBUG, "%s msg should have %d params, but %d
given",argv[0],n,argc); \
+ mgmt_log(LOG_DEBUG, "%s msg should have %d params, but %d
given",argv[0],n,argc); \
return cl_strdup(MSG_FAIL); \
}
-extern const char* mgmtd_name;
+extern const char* client_name;
extern int debug_level;
typedef char* (*msg_handler)(char* argv[], int argc);
extern int reg_msg(const char* type, msg_handler fun);
------------------------------
Message: 4
Date: Thu, 8 Dec 2005 01:54:56 -0700 (MST)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: mgmt by zhenh from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : zhenh
Host :
Project : linux-ha
Module : mgmt
Dir : linux-ha/mgmt/daemon
Modified Files:
mgmt_crm.c mgmt_hb.c mgmt_lrm.c
Log Message:
change name of mgmtd_log to mgmt_log
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_crm.c 6 Dec 2005 15:46:21 -0000 1.1
+++ mgmt_crm.c 8 Dec 2005 08:54:56 -0000 1.2
@@ -140,7 +140,7 @@
if(cib_object == NULL) {
return -1;
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
rc = cib_conn->cmds->delete(
cib_conn, type, cib_object, &output, 0);
@@ -158,18 +158,18 @@
int ret = cib_ok;
int i, max_try = 5;
- mgmtd_log(LOG_INFO,"init_crm");
+ mgmt_log(LOG_INFO,"init_crm");
cib_conn = cib_new();
for (i = 0; i < max_try ; i++) {
- ret = cib_conn->cmds->signon(cib_conn, mgmtd_name, cib_query);
+ ret = cib_conn->cmds->signon(cib_conn, client_name, cib_query);
if (ret == cib_ok) {
break;
}
- mgmtd_log(LOG_INFO,"login to cib: %d, ret:%d",i,ret);
+ mgmt_log(LOG_INFO,"login to cib: %d, ret:%d",i,ret);
sleep(1);
}
if (ret != cib_ok) {
- mgmtd_log(LOG_INFO,"login to cib failed");
+ mgmt_log(LOG_INFO,"login to cib failed");
cib_conn = NULL;
return -1;
}
@@ -248,7 +248,7 @@
data_set.input = save;
stage0(&data_set);
- mgmtd_log(LOG_INFO,"update cib finished");
+ mgmt_log(LOG_INFO,"update cib finished");
fire_event(EVT_CIB_CHANGED);
}
}
@@ -553,7 +553,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
if (in_group) {
@@ -585,7 +585,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
rc = cib_conn->cmds->create(cib_conn, "resources", fragment, &output,
0);
if (rc < 0) {
@@ -832,7 +832,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
rc = cib_conn->cmds->update(
@@ -906,7 +906,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
rc = cib_conn->cmds->update(
@@ -968,7 +968,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
rc = cib_conn->cmds->update(cib_conn, "resources", fragment, &output,
0);
if (rc < 0) {
@@ -1026,7 +1026,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "resources");
rc = cib_conn->cmds->update(cib_conn, "resources", fragment, &output,
0);
if (rc < 0) {
@@ -1174,7 +1174,7 @@
if(cib_object == NULL) {
return cl_strdup(MSG_FAIL);
}
- mgmtd_log(LOG_INFO, "xml:%s",xml);
+ mgmt_log(LOG_INFO, "xml:%s",xml);
fragment = create_cib_fragment(cib_object, "constraints");
rc = cib_conn->cmds->update(
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_hb.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_hb.c 6 Dec 2005 15:53:12 -0000 1.1
+++ mgmt_hb.c 8 Dec 2005 08:54:56 -0000 1.2
@@ -74,8 +74,8 @@
const char* name = NULL;
char* ret = cl_strdup(MSG_OK);
if (hb->llc_ops->init_nodewalk(hb) != HA_OK) {
- mgmtd_log(LOG_ERR, "Cannot start node walk");
- mgmtd_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
+ mgmt_log(LOG_ERR, "Cannot start node walk");
+ mgmt_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
cl_free(ret);
return cl_strdup(MSG_FAIL);
}
@@ -83,8 +83,8 @@
ret = mgmt_msg_append(ret, name);
}
if (hb->llc_ops->end_nodewalk(hb) != HA_OK) {
- mgmtd_log(LOG_ERR, "Cannot end node walk");
- mgmtd_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
+ mgmt_log(LOG_ERR, "Cannot end node walk");
+ mgmt_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
cl_free(ret);
return cl_strdup(MSG_FAIL);
}
@@ -112,9 +112,9 @@
init_heartbeat(void)
{
hb = ll_cluster_new("heartbeat");
- if (hb->llc_ops->signon(hb, mgmtd_name)!= HA_OK) {
- mgmtd_log(LOG_ERR, "Cannot sign on with heartbeat");
- mgmtd_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
+ if (hb->llc_ops->signon(hb, client_name)!= HA_OK) {
+ mgmt_log(LOG_ERR, "Cannot sign on with heartbeat");
+ mgmt_log(LOG_ERR, "REASON: %s", hb->llc_ops->errmsg(hb));
hb->llc_ops->delete(hb);
hb = NULL;
return HA_FAIL;
@@ -143,7 +143,7 @@
{
if (chan != NULL && chan->ch_status == IPC_DISCONNECT) {
fire_event(EVT_DISCONNECTED);
- mgmtd_log(LOG_ERR, "Lost connection to heartbeat service.");
+ mgmt_log(LOG_ERR, "Lost connection to heartbeat service.");
hb = NULL;
return FALSE;
}
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_lrm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- mgmt_lrm.c 6 Dec 2005 15:53:12 -0000 1.1
+++ mgmt_lrm.c 8 Dec 2005 08:54:56 -0000 1.2
@@ -49,7 +49,7 @@
int ret;
int i, max_try = 5;
- mgmtd_log(LOG_INFO,"init_lrm");
+ mgmt_log(LOG_INFO,"init_lrm");
lrm = ll_lrm_new("lrm");
for (i = 0; i < max_try ; i++) {
@@ -57,11 +57,11 @@
if (ret == HA_OK) {
break;
}
- mgmtd_log(LOG_INFO,"login to lrm: %d, ret:%d",i,ret);
+ mgmt_log(LOG_INFO,"login to lrm: %d, ret:%d",i,ret);
sleep(1);
}
if (ret != HA_OK) {
- mgmtd_log(LOG_INFO,"login to lrm failed");
+ mgmt_log(LOG_INFO,"login to lrm failed");
lrm->lrm_ops->delete(lrm);
lrm = NULL;
return -1;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 25, Issue 15
********************************************
