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: ldirectord by horms 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)
4. Linux-HA CVS: ldirectord by horms from
(linux-ha-cvs@lists.linux-ha.org)
----------------------------------------------------------------------
Message: 1
Date: Tue, 15 Aug 2006 02:38:52 -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:
Update the emailalert_resend hash first
In the case of a configurtation file update, it is possible
that entries in the emailalert_resend hash will never be deleted.
This should resolve this problem, by always emailalert_resend,
regadless of if a message will atually be sent or not.
Backport of 1.167 (ldirectord.in 1.23)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.70
retrieving revision 1.77.2.71
diff -u -3 -r1.77.2.70 -r1.77.2.71
--- ldirectord 15 Aug 2006 08:37:27 -0000 1.77.2.70
+++ ldirectord 15 Aug 2006 08:38:51 -0000 1.77.2.71
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.70 2006/08/15 08:37:27 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.71 2006/08/15 08:38:51 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3171,6 +3171,14 @@
my $to_addr;
my $frequency;
+ if ($currenttime == 0 or $frequency == 0) {
+ delete $EMAILSTATUS{"$server_str"};
+ }
+ else {
+ $EMAILSTATUS{$server_str}->{v} = $v;
+ $EMAILSTATUS{$server_str}->{alerttime} = $currenttime;
+ }
+
$to_addr = defined $v->{emailalert} ? $v->{emailalert} : $EMAILALERT;
if ($to_addr eq "") {
return 0;
@@ -3191,14 +3199,6 @@
$status = 1;
}
- if ($currenttime == 0 or $frequency == 0) {
- delete $EMAILSTATUS{"$server_str"};
- }
- else {
- $EMAILSTATUS{$server_str}->{v} = $v;
- $EMAILSTATUS{$server_str}->{alerttime} = $currenttime;
- }
-
return($status);
}
------------------------------
Message: 2
Date: Tue, 15 Aug 2006 02:39:47 -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:
Remove " x " from quescent log messages
This is just an artifact from some older, more verbose, logging
Backport of 1.68 (ldirectord.in 1.24)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.71
retrieving revision 1.77.2.72
diff -u -3 -r1.77.2.71 -r1.77.2.72
--- ldirectord 15 Aug 2006 08:38:51 -0000 1.77.2.71
+++ ldirectord 15 Aug 2006 08:39:46 -0000 1.77.2.72
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.71 2006/08/15 08:38:51 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.72 2006/08/15 08:39:46 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -2729,8 +2729,7 @@
if(defined($old_rservice)) {
$log_args .= "mapped from $old_rservice "
}
- $log_args .= "(" #. scalar(%{$v->{real_status}})
- . " x $virtual_str)";
+ $log_args .= "($virtual_str)";
my $server_str=$rservice . " " . $virtual_str;
my $currenttime=time();
@@ -2790,7 +2789,7 @@
. " -r $rservice $rforw -w $rwght";
$log_args = "$tag server: $rservice "
. "(" #. scalar(%{$v->{real_status}})
- . " x " . &get_virtual($v) . ")";
+ . &get_virtual($v) . ")";
#if the server exists then restore its weight
# otherwise add the server
------------------------------
Message: 3
Date: Tue, 15 Aug 2006 02:41:41 -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:
Consolidate duplicated quiescent log into one instance
Backport of 1.169 (ldirectord.in 1.25)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.72
retrieving revision 1.77.2.73
diff -u -3 -r1.77.2.72 -r1.77.2.73
--- ldirectord 15 Aug 2006 08:39:46 -0000 1.77.2.72
+++ ldirectord 15 Aug 2006 08:41:40 -0000 1.77.2.73
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.72 2006/08/15 08:39:46 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.73 2006/08/15 08:41:40 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -2737,13 +2737,12 @@
if (defined($or)) {
&system_wrapper("$IPVSADM -e "
. "$ipvsadm_args $rforw -w 0");
- &ld_log("Quiescent $log_args (Weight set to 0)");
}
else {
&system_wrapper("$IPVSADM -a "
. "$ipvsadm_args $rforw -w 0");
- &ld_log("Quiescent $log_args (Weight set to 0)");
}
+ &ld_log("Quiescent $log_args (Weight set to 0)");
&ld_emailalert_send("Quiescent $log_args (Weight set to 0)",
$v, $server_str, $currenttime);
}
------------------------------
Message: 4
Date: Tue, 15 Aug 2006 02:42:46 -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:
Rename ld_emailalert_send's emailsubject parameter to subject
Backport of 1.70 (ldirectord.in 1.26)
Signed-Off-By: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/Attic/ldirectord,v
retrieving revision 1.77.2.73
retrieving revision 1.77.2.74
diff -u -3 -r1.77.2.73 -r1.77.2.74
--- ldirectord 15 Aug 2006 08:41:40 -0000 1.77.2.73
+++ ldirectord 15 Aug 2006 08:42:45 -0000 1.77.2.74
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord,v 1.77.2.73 2006/08/15 08:41:40 horms Exp
$)[2];
+my($VERSION)=(qw$Id: ldirectord,v 1.77.2.74 2006/08/15 08:42:45 horms Exp
$)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -3162,7 +3162,7 @@
sub ld_emailalert_send
{
- my ($emailsubject, $v, $server_str, $currenttime) = (@_);
+ my ($subject, $v, $server_str, $currenttime) = (@_);
my $emailmsg;
my $emailfh;
my $status = 0;
@@ -3187,11 +3187,11 @@
use Mail::Send;
- &ld_log("emailalert: $emailsubject");
+ &ld_log("emailalert: $subject");
- unless ($emailmsg = new Mail::Send Subject=>$emailsubject, To=>$to_addr
+ unless ($emailmsg = new Mail::Send Subject=>$subject, To=>$to_addr
and $emailfh = $emailmsg->open
- and print $emailfh $emailsubject
+ and print $emailfh $subject
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 55
********************************************
