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: mgmt by zhenh 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: lib by sunjd from ([email protected])
5. Linux-HA CVS: mgmt by zhenh from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Sun, 9 Apr 2006 18:39:43 -0600 (MDT)
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/client
Modified Files:
Makefile.am
Log Message:
fix the build break when we indicate the DESTDIR
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/Makefile.am,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- Makefile.am 7 Apr 2006 08:35:30 -0000 1.10
+++ Makefile.am 10 Apr 2006 00:39:42 -0000 1.11
@@ -41,7 +41,7 @@
mozhCN_DATA = haclient.zh_CN.mo
install-data-hook:
- mv $(datadir)/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
$(datadir)/locale/zh_CN/LC_MESSAGES/haclient.mo
+ mv $(DESTDIR)/$(datadir)/locale/zh_CN/LC_MESSAGES/haclient.zh_CN.mo
$(DESTDIR)/$(datadir)/locale/zh_CN/LC_MESSAGES/haclient.mo
EXTRA_DIST = $(halib_DATA) $(mozhCN_DATA)
------------------------------
Message: 2
Date: Sun, 9 Apr 2006 19:38:10 -0600 (MDT)
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:
mgmtd.c
Log Message:
hide the login information
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmtd.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -3 -r1.18 -r1.19
--- mgmtd.c 27 Mar 2006 08:33:20 -0000 1.18
+++ mgmtd.c 10 Apr 2006 01:38:10 -0000 1.19
@@ -416,7 +416,6 @@
/* create gnutls session for the server socket */
session = tls_attach_server(csock);
msg = mgmt_session_recvmsg(session);
- mgmt_log(LOG_DEBUG, "recv msg: %s", msg);
args = mgmt_msg_args(msg, &num);
if (msg == NULL || num != 3 || STRNCMP_CONST(args[0],
MSG_LOGIN) != 0) {
mgmt_del_args(args);
@@ -427,6 +426,7 @@
mgmt_log(LOG_ERR, "%s receive login msg failed",
__FUNCTION__);
return TRUE;
}
+ mgmt_log(LOG_DEBUG, "recv msg: %s %s ****", args[0], args[1]);
/* authorization check with pam */
if (pam_auth(args[1],args[2]) != 0 ||
!usr_belong_grp(args[1],ALLOW_GRP)) {
mgmt_del_args(args);
------------------------------
Message: 3
Date: Sun, 9 Apr 2006 20:19:20 -0600 (MDT)
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/client
Modified Files:
haclient.py.in
Log Message:
update the active nodes list everytime we query active nodes instead of only
update when login
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- haclient.py.in 7 Apr 2006 08:37:06 -0000 1.22
+++ haclient.py.in 10 Apr 2006 02:19:20 -0000 1.23
@@ -439,9 +439,8 @@
msgbox(_("can not get information from cluster!"))
return
- activenodes = manager.get_active_nodes()
- manager.activenodes = activenodes
- if activenodes == None :
+ active_nodes = manager.get_active_nodes()
+ if active_nodes == None :
msgbox(_("can not get information from cluster!"))
return
@@ -455,7 +454,7 @@
nodes_root = self.store.append(root, [_("Nodes"),"", "nodes"])
for node in nodes :
- self.add_node(nodes_root, node, node in activenodes)
+ self.add_node(nodes_root, node, node in active_nodes)
rscs_root = self.store.append(root, [_("Resources"),"",
"resources"])
rscs = manager.get_all_rsc_id()
@@ -1437,7 +1436,6 @@
self.connected = True
self.username = username
self.password = password
- self.active_nodes = self.get_active_nodes()
window.statusbar.push(2,"Updating data from server...")
self.update_timer = gobject.timeout_add(100, self.update)
@@ -1549,7 +1547,8 @@
return self.query("all_nodes")
def get_active_nodes(self):
- return self.query("active_nodes")
+ self.active_nodes = self.query("active_nodes")
+ return self.active_nodes
def get_node_config(self, node) :
node_attr_names = ["uname", "online","standby", "unclean",
"shutdown",
------------------------------
Message: 4
Date: Mon, 10 Apr 2006 00:21:06 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by sunjd from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : sunjd
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/lrm
Modified Files:
clientlib.c
Log Message:
for bug1179: should use the return value
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/lrm/clientlib.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- clientlib.c 3 Apr 2006 09:10:51 -0000 1.64
+++ clientlib.c 10 Apr 2006 06:21:05 -0000 1.65
@@ -1014,7 +1014,7 @@
}
ha_msg_del(op_msg);
}
- g_list_sort(op_list, compare_call_id);
+ op_list = g_list_sort(op_list, compare_call_id);
/* Delete the duplicate op for call_id */
#if 0
------------------------------
Message: 5
Date: Mon, 10 Apr 2006 00:23:36 -0600 (MDT)
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
Log Message:
use update_attr to update the attribute of crm
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -3 -r1.24 -r1.25
--- mgmt_crm.c 6 Apr 2006 04:31:26 -0000 1.24
+++ mgmt_crm.c 10 Apr 2006 06:23:36 -0000 1.25
@@ -396,34 +396,17 @@
on_update_crm_config(char* argv[], int argc)
{
int rc;
- crm_data_t* fragment = NULL;
- crm_data_t* cib_object = NULL;
- crm_data_t* output = NULL;
- char xml[MAX_STRLEN];
-
+
ARGC_CHECK(3);
- snprintf(xml, MAX_STRLEN, "<cluster_property_set
id=\"default-options\"><attributes>"
- "<nvpair id=\"%s\" name=\"%s\"
value=\"%s\"/></attributes></cluster_property_set>"
- , argv[1],argv[1],argv[2]);
-
- cib_object = string2xml(xml);
- if(cib_object == NULL) {
- return cl_strdup(MSG_FAIL);
+ rc = update_attr(cib_conn, cib_sync_call, XML_CIB_TAG_CRMCONFIG, NULL
+ , CIB_OPTIONS_FIRST, NULL, argv[1], argv[2]);
+
+ if (rc == cib_ok) {
+ return cl_strdup(MSG_OK);
}
-
- fragment = create_cib_fragment(cib_object, "crm_config");
-
- mgmt_log(LOG_DEBUG, "(update)xml:%s",xml);
-
- rc = cib_conn->cmds->update(
- cib_conn, "crm_config", fragment, &output,
cib_sync_call);
- free_xml(fragment);
- free_xml(cib_object);
- if (rc < 0) {
- return failed_msg(output, rc);
+ else {
+ return cl_strdup(MSG_FAIL);
}
- free_xml(output);
- return cl_strdup(MSG_OK);
}
/* node functions */
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 29, Issue 51
********************************************
