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: lrm by sunjd from ([email protected])
3. Linux-HA CVS: crm by andrew from
([email protected])
----------------------------------------------------------------------
Message: 1
Date: Wed, 8 Feb 2006 02:21:31 -0700 (MST)
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:
pengine.c
Log Message:
Logging
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/pengine/pengine.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -3 -r1.102 -r1.103
--- pengine.c 16 Jan 2006 09:16:32 -0000 1.102
+++ pengine.c 8 Feb 2006 09:21:31 -0000 1.103
@@ -1,4 +1,4 @@
-/* $Id: pengine.c,v 1.102 2006/01/16 09:16:32 andrew Exp $ */
+/* $Id: pengine.c,v 1.103 2006/02/08 09:21:31 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
*
@@ -121,23 +121,21 @@
if(was_processing_error) {
crm_info("ERRORs found during PE processing."
" Input follows:");
- crm_log_xml_info(log_input, "[input]");
+ crm_log_xml(
+ pengine_input_loglevel-2, "[input]", log_input);
} else if(was_processing_warning) {
crm_log_maybe(pengine_input_loglevel-1,
"WARNINGs found during PE processing."
" Input follows:");
- crm_log_xml(pengine_input_loglevel-1,
- "[input]", status);
+ crm_log_xml(
+ pengine_input_loglevel-1,"[input]", log_input);
+ } else if (crm_log_level > pengine_input_loglevel) {
+ crm_log_xml(
+ pengine_input_loglevel+1, "[input]", log_input);
} else {
- if(crm_log_level > LOG_DEBUG) {
- crm_log_xml_debug_2(log_input, "[input]");
-
- } else {
- crm_log_xml(pengine_input_loglevel,
- "[status]", status);
- }
+ crm_log_xml(pengine_input_loglevel, "[status]", status);
}
if(was_config_error) {
------------------------------
Message: 2
Date: Wed, 8 Feb 2006 03:22:33 -0700 (MST)
From: [email protected]
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:
remove the redundant code
------------------------------
Message: 3
Date: Wed, 8 Feb 2006 05:34:25 -0700 (MST)
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/admin
Modified Files:
crm_verify.c
Log Message:
Fix a false positive in memory leak detection
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/crm/admin/crm_verify.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- crm_verify.c 26 Jan 2006 11:36:58 -0000 1.3
+++ crm_verify.c 8 Feb 2006 12:34:25 -0000 1.4
@@ -1,4 +1,4 @@
-/* $Id: crm_verify.c,v 1.3 2006/01/26 11:36:58 andrew Exp $ */
+/* $Id: crm_verify.c,v 1.4 2006/02/08 12:34:25 andrew Exp $ */
/*
* Copyright (C) 2004 Andrew Beekhof <[EMAIL PROTECTED]>
@@ -155,14 +155,14 @@
crm_info("=#=#=#=#= Getting XML =#=#=#=#=");
+ crm_zero_mem_stats(NULL);
+
if(USE_LIVE_CIB) {
cib_conn = cib_new();
rc = cib_conn->cmds->signon(
cib_conn, crm_system_name, cib_command_synchronous);
}
- crm_zero_mem_stats(NULL);
-
if(USE_LIVE_CIB) {
if(rc == cib_ok) {
crm_info("Reading XML from: live cluster");
@@ -210,14 +210,6 @@
cleanup_calculations(&data_set);
- crm_mem_stats(NULL);
- CRM_DEV_ASSERT(crm_mem_stats(NULL) == FALSE);
-
- if(USE_LIVE_CIB) {
- cib_conn->cmds->signoff(cib_conn);
- cib_delete(cib_conn);
- }
-
if(was_config_error) {
fprintf(stderr, "Errors found during check: config not
valid\n");
if(crm_log_level < LOG_WARNING) {
@@ -232,6 +224,14 @@
}
return 1;
}
+
+ if(USE_LIVE_CIB) {
+ cib_conn->cmds->signoff(cib_conn);
+ cib_delete(cib_conn);
+ }
+
+ crm_mem_stats(NULL);
+ CRM_DEV_ASSERT(crm_mem_stats(NULL) == FALSE);
return 0;
}
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
[email protected]
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 27, Issue 35
********************************************
