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: crm by andrew from
([email protected])
2. Linux-HA CVS: lib by andrew from
([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
4. Linux-HA CVS: lib by andrew from
([email protected])
5. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Thu, 11 May 2006 03:11:33 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/pengine
Modified Files:
utils.c
Log Message:
Use the logging macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/utils.c,v
retrieving revision 1.135
retrieving revision 1.136
diff -u -3 -r1.135 -r1.136
--- utils.c 5 May 2006 13:08:49 -0000 1.135
+++ utils.c 11 May 2006 09:11:33 -0000 1.136
@@ -1,4 +1,4 @@
-/* $Id: utils.c,v 1.135 2006/05/05 13:08:49 andrew Exp $ */
+/* $Id: utils.c,v 1.136 2006/05/11 09:11:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -1420,9 +1420,6 @@
rsc->fns->print(rsc, pre_text, options, &log_level);
}
-
-#define util_log(fmt...) do_crm_log(log_level, __FILE__, __FUNCTION__, fmt)
-
void
log_action(unsigned int log_level, const char *pre_text, action_t *action,
gboolean details)
{
@@ -1431,9 +1428,9 @@
if(action == NULL) {
- util_log("%s%s: <NULL>",
- pre_text==NULL?"":pre_text,
- pre_text==NULL?"":": ");
+ crm_log_maybe(log_level, "%s%s: <NULL>",
+ pre_text==NULL?"":pre_text,
+ pre_text==NULL?"":": ");
return;
}
------------------------------
Message: 2
Date: Thu, 11 May 2006 03:11:34 -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:
xml.c
Log Message:
Use the logging macros
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -3 -r1.79 -r1.80
--- xml.c 9 May 2006 06:34:05 -0000 1.79
+++ xml.c 11 May 2006 09:11:33 -0000 1.80
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.79 2006/05/09 06:34:05 andrew Exp $ */
+/* $Id: xml.c,v 1.80 2006/05/11 09:11:33 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -568,18 +568,18 @@
int j;
if(message != NULL) {
- do_crm_log(log_level, __FILE__, __FUNCTION__, "%s", message);
+ crm_log_maybe(log_level, "%s", message);
}
- do_crm_log(log_level, __FILE__, __FUNCTION__, "Contents of the
array:");
+ crm_log_maybe(log_level, "Contents of the array:");
if(array == NULL || array[0] == NULL || depth == 0) {
- do_crm_log(log_level, __FILE__, __FUNCTION__, "\t<empty>");
+ crm_log_maybe(log_level, "\t<empty>");
return;
}
for (j=0; j < depth && array[j] != NULL; j++) {
if (array[j] == NULL) { break; }
- do_crm_log(log_level, __FILE__, __FUNCTION__, "\t--> (%s).",
array[j]);
+ crm_log_maybe(log_level, "\t--> (%s).", array[j]);
}
}
------------------------------
Message: 3
Date: Thu, 11 May 2006 03:25:23 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
lrm.c
Log Message:
It doesnt contain what we wanted... so what *does* it contain?
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/lrm.c,v
retrieving revision 1.191
retrieving revision 1.192
diff -u -3 -r1.191 -r1.192
--- lrm.c 5 May 2006 13:08:49 -0000 1.191
+++ lrm.c 11 May 2006 09:25:23 -0000 1.192
@@ -890,9 +890,15 @@
}
#endif
}
- CRM_CHECK(params != NULL, return I_NULL);
- CRM_CHECK(op_task != NULL, return I_NULL);
- CRM_CHECK(op_interval != NULL, return I_NULL);
+ CRM_CHECK(params != NULL,
+ crm_log_xml_warn(input->xml, "Bad command");
+ return I_NULL);
+ CRM_CHECK(op_task != NULL,
+ crm_log_xml_warn(input->xml, "Bad command");
+ return I_NULL);
+ CRM_CHECK(op_interval != NULL,
+ crm_log_xml_warn(input->xml, "Bad command");
+ return I_NULL);
op = construct_op(input->xml, rsc->id, op_task);
CRM_ASSERT(op != NULL);
------------------------------
Message: 4
Date: Thu, 11 May 2006 03:36:18 -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:
xml.c
Log Message:
Function is the third argument
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/lib/crm/common/xml.c,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -3 -r1.80 -r1.81
--- xml.c 11 May 2006 09:11:33 -0000 1.80
+++ xml.c 11 May 2006 09:36:17 -0000 1.81
@@ -1,4 +1,4 @@
-/* $Id: xml.c,v 1.80 2006/05/11 09:11:33 andrew Exp $ */
+/* $Id: xml.c,v 1.81 2006/05/11 09:36:17 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -853,7 +853,7 @@
printed = sprintf(buffer, "%s>", has_children==0?"/":"");
update_buffer_head(buffer, printed);
- do_crm_log(log_level, function, NULL, "%s%s",
+ do_crm_log(log_level, NULL, function, "%s%s",
prefix?prefix:"", print_buffer);
buffer = print_buffer;
@@ -873,7 +873,7 @@
printed = print_spaces(buffer, depth);
update_buffer_head(buffer, printed);
}
- do_crm_log(log_level, function, NULL, "%s%s</%s>",
+ do_crm_log(log_level, NULL, function, "%s%s</%s>",
prefix?prefix:"", print_buffer, name);
crm_debug_5("Dumped %s...", name);
------------------------------
Message: 5
Date: Thu, 11 May 2006 03:36:18 -0600 (MDT)
From: [email protected]
Subject: [Linux-ha-cvs] Linux-HA CVS: crm by andrew from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : andrew
Host :
Project : linux-ha
Module : crm
Dir : linux-ha/crm/crmd
Modified Files:
messages.c
Log Message:
Function is the third argument
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/crmd/messages.c,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -3 -r1.151 -r1.152
--- messages.c 11 May 2006 09:11:33 -0000 1.151
+++ messages.c 11 May 2006 09:36:17 -0000 1.152
@@ -359,13 +359,13 @@
{
void *ret_val = NULL;
if(fsa_data == NULL) {
- do_crm_log(LOG_ERR, caller, NULL, "No FSA data available");
+ do_crm_log(LOG_ERR, NULL, caller, "No FSA data available");
} else if(fsa_data->data == NULL) {
- do_crm_log(LOG_ERR, caller, NULL, "No message data available");
+ do_crm_log(LOG_ERR, NULL, caller, "No message data available");
} else if(fsa_data->data_type != a_type) {
- do_crm_log(LOG_CRIT, caller, NULL,
+ do_crm_log(LOG_CRIT, NULL, caller,
"Message data was the wrong type! %d vs.
requested=%d."
" Origin: %s",
fsa_data->data_type, a_type, fsa_data->origin);
------------------------------
_______________________________________________
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 33
********************************************
