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: include by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: mgmt by zhenh from
([email protected])
4. Linux-HA CVS: lib by sunjd from ([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 May 2006 03:39:39 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: include by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : include
Dir : linux-ha/include/crm
Modified Files:
crm.h
Log Message:
Formatting
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/include/crm/crm.h,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- crm.h 6 Apr 2006 10:44:13 -0000 1.93
+++ crm.h 11 May 2006 09:39:39 -0000 1.94
@@ -1,4 +1,4 @@
-/* $Id: crm.h,v 1.93 2006/04/06 10:44:13 andrew Exp $ */
+/* $Id: crm.h,v 1.94 2006/05/11 09:39:39 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -209,7 +209,7 @@
#define crm_notice(w...) do_crm_log(LOG_NOTICE, __FILE__,
__PRETTY_FUNCTION__, w)
#define crm_info(w...) do_crm_log(LOG_INFO, __FILE__,
__PRETTY_FUNCTION__, w)
#define crm_log_maybe(level, fmt...) if(crm_log_level >= (level)) { \
- do_crm_log((level), __FILE__, __PRETTY_FUNCTION__, fmt);
\
+ do_crm_log((level), __FILE__, __PRETTY_FUNCTION__, fmt); \
}
#define crm_debug(fmt...) crm_log_maybe(LOG_DEBUG, fmt)
------------------------------
Message: 2
Date: Thu, 11 May 2006 03:54:26 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: lib by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : lib
Dir : linux-ha/lib/crm/common
Modified Files:
utils.c
Log Message:
Tweak the crm log format
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/utils.c,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -3 -r1.50 -r1.51
--- utils.c 8 May 2006 14:39:52 -0000 1.50
+++ utils.c 11 May 2006 09:54:25 -0000 1.51
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.50 2006/05/08 14:39:52 andrew Exp $ */
+/* $Id: utils.c,v 1.51 2006/05/11 09:54:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -316,6 +316,7 @@
{
int log_as = log_level;
gboolean do_log = FALSE;
+
if(log_level <= (int)crm_log_level) {
do_log = TRUE;
if(log_level > LOG_INFO) {
@@ -334,25 +335,21 @@
log_level -= LOG_INFO;
if(log_level > 1) {
- if(file == NULL && function == NULL) {
- cl_log(log_as, "[%d] %s", log_level, buf);
+ if(function == NULL) {
+ cl_log(log_as, "debug%d: %s", log_level, buf);
} else {
- cl_log(log_as, "mask(%s%s%s [%d]): %s",
- file?file:"",
- (file !=NULL && function !=NULL)?":":"",
- function?function:"", log_level, buf);
+ cl_log(log_as, "debug%d: %s:%s %s",
+ log_level, function, file?file:"", buf);
}
} else {
- if(file == NULL && function == NULL) {
+ if(function == NULL) {
cl_log(log_as, "%s", buf);
} else {
- cl_log(log_as, "mask(%s%s%s): %s",
- file?file:"",
- (file !=NULL && function !=NULL)?":":"",
- function?function:"", buf);
+ cl_log(log_as, "%s:%s %s",
+ function, file?file:"", buf);
}
}
------------------------------
Message: 3
Date: Thu, 11 May 2006 04:08:19 -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:
fix the bug in stonith RA's metadata
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/client/haclient.py.in,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -3 -r1.35 -r1.36
--- haclient.py.in 11 May 2006 08:38:46 -0000 1.35
+++ haclient.py.in 11 May 2006 10:08:19 -0000 1.36
@@ -978,7 +978,6 @@
def on_type_changed(self, widget, glade) :
cur_class = glade.get_widget("class").child.get_text()
cur_type = glade.get_widget("type").child.get_text()
-
provider_list = manager.get_rsc_providers(cur_class,cur_type)
store = gtk.ListStore(str)
for i in provider_list:
@@ -1792,7 +1791,8 @@
return None
meta_data = ""
for line in lines :
- meta_data = meta_data + line + "\n"
+ if len(line)!= 0 :
+ meta_data = meta_data + line + "\n"
try :
doc_xml = parseString(meta_data).documentElement
except xml.parsers.expat.ExpatError:
@@ -1846,7 +1846,10 @@
return self.query("rsc_types\n"+rsc_class)
def get_rsc_providers(self, rsc_class, rsc_type) :
- return self.query("rsc_providers\n%s\n%s"%(rsc_class, rsc_type))
+ provider = self.query("rsc_providers\n%s\n%s"%(rsc_class,
rsc_type))
+ if provider == [] :
+ return [""]
+ return provider
def rsc_exists(self, rsc_id) :
return rsc_id in self.get_all_rsc_id()
------------------------------
Message: 4
Date: Thu, 11 May 2006 04:48:53 -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/plugins/lrm
Modified Files:
raexecstonith.c
Log Message:
1) Remove a preceded bland line in metadata
2) Temporarily make the provider be only fixed "heartbeat"
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/plugins/lrm/raexecstonith.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -3 -r1.15 -r1.16
--- raexecstonith.c 29 Mar 2006 02:31:13 -0000 1.15
+++ raexecstonith.c 11 May 2006 10:48:52 -0000 1.16
@@ -87,7 +87,7 @@
get_resource_meta
};
-static const char * meta_data1 = "\n"
+static const char * meta_data1 =
"<?xml version=\"1.0\"?>\n"
"<!DOCTYPE resource-agent SYSTEM \"ra-api-1.dtd\">\n"
"<resource-agent name=\"";
@@ -338,8 +338,10 @@
cl_log(LOG_ERR, "%s:%d: Parameter error: *providers==NULL."
"This will cause memory leak."
, __FUNCTION__, __LINE__);
- *providers = NULL;
}
- return 0;
+ /* Now temporarily make it fixed */
+ *providers = g_list_append(*providers, g_strdup("heartbeat"));
+
+ return g_list_length(*providers);
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 30, Issue 34
********************************************
