Send Linux-ha-cvs mailing list submissions to
linux-ha-cvs@lists.linux-ha.org
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
(linux-ha-cvs@lists.linux-ha.org)
2. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
3. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 02:28:09 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
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:
Three bugs found by beam. 1. not check the return value of cl_malloc. 2. memory
like of ret, 3. wrong string format
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/mgmt/daemon/mgmt_crm.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -3 -r1.64 -r1.65
--- mgmt_crm.c 11 Aug 2006 07:07:22 -0000 1.64
+++ mgmt_crm.c 15 Aug 2006 08:28:09 -0000 1.65
@@ -171,6 +171,10 @@
}
data_set = (pe_working_set_t*)cl_malloc(sizeof(pe_working_set_t));
+ if (data_set == NULL) {
+ mgmt_log(LOG_ERR, "%s:Can't alloc memory for data
set.",__FUNCTION__);
+ return NULL;
+ }
set_working_set_defaults(data_set);
data_set->input = get_cib_copy(cib_conn);
data_set->now = new_ha_date(TRUE);
@@ -211,7 +215,7 @@
}
ret = cl_strdup(MSG_FAIL);
- ret = mgmt_msg_append(ret, cib_error2string(rc));
+ ret = mgmt_msg_append(ret, cib_error2string((enum cib_errors)rc));
if (output == NULL) {
return ret;
@@ -251,11 +255,9 @@
get_parent(resource_t* child)
{
GList* cur;
- char* ret;
pe_working_set_t* data_set;
data_set = get_data_set();
- ret = cl_strdup(MSG_OK);
cur = data_set->resources;
while (cur != NULL) {
resource_t* rsc = (resource_t*)cur->data;
@@ -364,7 +366,6 @@
{
int i;
resource_t* rsc;
- char* ret;
const char * name_nvpair;
const char * id_nvpair;
struct ha_msg* attrs;
@@ -379,7 +380,6 @@
return;
}
- ret = cl_strdup(MSG_OK);
attrs = cl_get_struct((struct ha_msg*)rsc->xml, "instance_attributes");
if(attrs == NULL) {
snprintf(id, MAX_STRLEN, "%s_%s", rsc_id, attr);
@@ -763,7 +763,7 @@
}
snprintf(xml, MAX_STRLEN,
- "<node id=\"%s\"><instance_attributes id=\"nodes-\%s\">"
+ "<node id=\"%s\"><instance_attributes id=\"nodes-\"%s\">"
"<attributes><nvpair id=\"standby-%s\" name=\"standby\"
value=\"%s\"/>"
"</attributes></instance_attributes></node>",
id, id, id, argv[2]);
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 02:28:14 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Document which global settings are also per-virtual settings more clearly
Backport of 1.161 (ldirectord 1.17)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.64
retrieving revision 1.77.2.65
diff -u -3 -r1.77.2.64 -r1.77.2.65
--- ldirectord 15 Aug 2006 08:27:07 -0000 1.77.2.64
+++ ldirectord 15 Aug 2006 08:28:14 -0000 1.77.2.65
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.64 2006/08/15 08:27:07 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.65 2006/08/15 08:28:14 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -110,7 +110,7 @@
Timeout in seconds for connect checks. If the timeout is exceeded then the
real server is declared dead.
-If defined in virtual server section then the global value is overridden.
+If defined in a virtual server section then the global value is overridden.
Default: 5 seconds
@@ -122,7 +122,7 @@
Timeout in seconds for negotiate checks.
-If defined in virtual server section then the global value is overridden.
+If defined in a virtual server section then the global value is overridden.
Default: defined by the operating system
@@ -140,6 +140,8 @@
seconds, then a total of 6 seconds worth of timeout will occur becore
the check fails.
+If defined in a virtual server section then the global value is overridden.
+
Default: 1
B<autoreload = >[B<yes>|B<no>]
@@ -169,9 +171,7 @@
servers are down. Typically this would be 127.0.0.1 with
an emergency page.
-This directive may also appear within a virtual server, in which
-case it will overide the global fallback server, if set.
-
+If defined in a virtual server section then the global value is overridden.
B<logfile = ">I</path/to/logfile>B<">|syslog_facility
@@ -189,6 +189,8 @@
using any of the built-in methods. See perldoc Mail::Mailer for more info on
methods.
+If defined in a virtual server section then the global value is overridden.
+
B<emailalertfreq => I<n>
@@ -198,6 +200,8 @@
setting is dependent on the number of seconds defined in the checkinterval
configuration option.
+If defined in a virtual server section then the global value is overridden.
+
Default: 0
@@ -232,8 +236,7 @@
If I<no>, then the real or failback servers will be removed
from the kernel's LVS table. The default is I<yes>.
-This directive may also appear within a virtual server, in which
-case it will overide the global fallback server, if set.
+If defined in a virtual server section then the global value is overridden.
Default: I<yes>
@@ -260,9 +263,9 @@
overridden, otherwise the IP-address and port of the real server is used.
=head2 More than one of these entries may be inside a virtual section. The
-fallback, emailalert, emailalertfreq and quiescent options listed above may
-also appear inside a virtual section, in which case the global setting is
-overridden.
+checktimeout, negotiatetimeout, checkcount, fallback, emailalert,
+emailalertfreq and quiescent options listed above may also appear inside a
+virtual section, in which case the global setting is overridden.
B<checktype = >I<negotiate>|I<connect>|I<N>|I<ping>|I<off>|I<on>
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 02:29:17 -0600 (MDT)
From: linux-ha-cvs@lists.linux-ha.org
Subject: [Linux-ha-cvs] Linux-HA CVS: ldirectord by horms from
To: [EMAIL PROTECTED]
Message-ID: <[EMAIL PROTECTED]>
linux-ha CVS committal
Author : horms
Host :
Project : linux-ha
Module : ldirectord
Dir : linux-ha/ldirectord
Modified Files:
Tag: STABLE_1_2
ldirectord
Log Message:
Add body to emailalert
Backport of 1.162 (ldirectord 1.18)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.65
retrieving revision 1.77.2.66
diff -u -3 -r1.77.2.65 -r1.77.2.66
--- ldirectord 15 Aug 2006 08:28:14 -0000 1.77.2.65
+++ ldirectord 15 Aug 2006 08:29:16 -0000 1.77.2.66
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.65 2006/08/15 08:28:14 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.66 2006/08/15 08:29:16 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3190,7 +3190,7 @@
unless ($emailmsg = new Mail::Send Subject=>$emailsubject, To=>$emailto
and $emailfh = $emailmsg->open
- and print $emailfh ""
+ and print $emailfh $emailsubject
and $emailfh->close) {
&ld_log("failed to send email message\n");
$status = 1;
------------------------------
_______________________________________________
Linux-ha-cvs mailing list
Linux-ha-cvs@lists.linux-ha.org
http://lists.community.tummy.com/mailman/listinfo/linux-ha-cvs
End of Linux-ha-cvs Digest, Vol 33, Issue 52
********************************************
