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: Mon, 14 Aug 2006 21:55:53 -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:
ldirectord.in
Log Message:
Invalid timeout error messages had the wrong descriptions
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- ldirectord.in 15 Aug 2006 03:55:06 -0000 1.7
+++ ldirectord.in 15 Aug 2006 03:55:52 -0000 1.8
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.7 2006/08/15 03:55:06 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.8 2006/08/15 03:55:52 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -874,10 +874,10 @@
$1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid check timeout");
$vsrv{checktimeout} = $1;
} elsif ($rcmd =~ /^connecttimeout\s*=\s*(.*)/){
- $1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid check timeout");
+ $1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid connect timeout");
$vsrv{connecttimeout} = $1;
} elsif ($rcmd =~
/^negotiatetimeout\s*=\s*(.*)/){
- $1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid check timeout");
+ $1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid negotiate timeout");
$vsrv{negotiatetimeout} = $1;
} elsif ($rcmd =~ /^checkcount\s*=\s*(.*)/){
$1 =~ /(\d+)/ && $1 or
&config_error($line, "invalid check count");
------------------------------
Message: 2
Date: Mon, 14 Aug 2006 21:56:33 -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:
ldirectord.in
Log Message:
Zero is a valid, though somewhat silly timeout
The code currently allows zero to be set as the global timeout.
But if the global timeout is non-zero then it will override
any per-virtial timeouts that are set to 0.
This patch fixes that inconsistenty by using -1 as the non-set value
rather than 0.
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -3 -r1.8 -r1.9
--- ldirectord.in 15 Aug 2006 03:55:52 -0000 1.8
+++ ldirectord.in 15 Aug 2006 03:56:32 -0000 1.9
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.8 2006/08/15 03:55:52 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.9 2006/08/15 03:56:32 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -830,10 +830,10 @@
$vsrv{login} = "";
$vsrv{passwd} = "";
$vsrv{database} = "";
- $vsrv{checktimeout} = 0;
- $vsrv{connecttimeout} = 0;
+ $vsrv{checktimeout} = -1;
+ $vsrv{connecttimeout} = -1;
$vsrv{checkcount} = 1;
- $vsrv{negotiatetimeout} = 0;
+ $vsrv{negotiatetimeout} = -1;
$vsrv{num_connects} = 0;
$vsrv{httpmethod} = "GET";
push(@VIRTUAL, \%vsrv);
@@ -1510,11 +1510,11 @@
$$r{num_connects} = -1;
}
}
- $$v{checktimeout} = $CHECKTIMEOUT if ($$v{checktimeout}<=0);
- $$v{connecttimeout} = $CONNECTTIMEOUT if
($$v{connecttimeout}<=0);
- $$v{connecttimeout} = $$v{checktimeout} if
($$v{connecttimeout}<=0);
- $$v{negotiatetimeout} = $NEGOTIATETIMEOUT if
($$v{negotiatetimeout}<=0);
- $$v{negotiatetimeout} = $$v{checktimeout} if
($$v{negotiatetimeout}<=0);
+ $$v{checktimeout} = $CHECKTIMEOUT if ($$v{checktimeout} < 0);
+ $$v{connecttimeout} = $CONNECTTIMEOUT if ($$v{connecttimeout} <
0);
+ $$v{connecttimeout} = $$v{checktimeout} if ($$v{connecttimeout}
< 0);
+ $$v{negotiatetimeout} = $NEGOTIATETIMEOUT if
($$v{negotiatetimeout} < 0);
+ $$v{negotiatetimeout} = $$v{checktimeout} if
($$v{negotiatetimeout} < 0);
}
}
------------------------------
Message: 3
Date: Mon, 14 Aug 2006 21:57:15 -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:
ldirectord.in
Log Message:
Make setting of default timeouts less than 80 columns wide
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- ldirectord.in 15 Aug 2006 03:56:32 -0000 1.9
+++ ldirectord.in 15 Aug 2006 03:57:15 -0000 1.10
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.9 2006/08/15 03:56:32 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.10 2006/08/15 03:57:15 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -1510,11 +1510,21 @@
$$r{num_connects} = -1;
}
}
- $$v{checktimeout} = $CHECKTIMEOUT if ($$v{checktimeout} < 0);
- $$v{connecttimeout} = $CONNECTTIMEOUT if ($$v{connecttimeout} <
0);
- $$v{connecttimeout} = $$v{checktimeout} if ($$v{connecttimeout}
< 0);
- $$v{negotiatetimeout} = $NEGOTIATETIMEOUT if
($$v{negotiatetimeout} < 0);
- $$v{negotiatetimeout} = $$v{checktimeout} if
($$v{negotiatetimeout} < 0);
+ if ($$v{checktimeout} < 0) {
+ $$v{checktimeout} = $CHECKTIMEOUT;
+ }
+ if ($$v{connecttimeout} < 0) {
+ $$v{connecttimeout} = $CONNECTTIMEOUT;
+ }
+ if ($$v{connecttimeout} < 0) {
+ $$v{connecttimeout} = $$v{checktimeout};
+ }
+ if ($$v{negotiatetimeout} < 0) {
+ $$v{negotiatetimeout} = $NEGOTIATETIMEOUT;
+ }
+ if ($$v{negotiatetimeout} < 0) {
+ $$v{negotiatetimeout} = $$v{checktimeout};
+ }
}
}
------------------------------
Message: 4
Date: Mon, 14 Aug 2006 21:57:58 -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:
ldirectord.in
Log Message:
Make global and non-glbal invalid timeout messages consistent
Also make the global checkinterval (no non-global variant exists)
consistent with thsi scheme.
Signed-off-by: Simon Horman <[EMAIL PROTECTED]>
===================================================================
RCS file: /home/cvs/linux-ha/linux-ha/ldirectord/ldirectord.in,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- ldirectord.in 15 Aug 2006 03:57:15 -0000 1.10
+++ ldirectord.in 15 Aug 2006 03:57:58 -0000 1.11
@@ -1,5 +1,5 @@
#!/usr/bin/perl
-my($VERSION)=(qw$Id: ldirectord.in,v 1.10 2006/08/15 03:57:15 horms Exp $)[2];
+my($VERSION)=(qw$Id: ldirectord.in,v 1.11 2006/08/15 03:57:58 horms Exp $)[2];
######################################################################
# ldirectord http://www.vergenet.net/linux/ldirectord/
@@ -1012,19 +1012,19 @@
next if ($_ =~ /^\s*$/ || $_ =~ /^\s*#/);
if ($_ =~ /^checktimeout\s*=\s*(.*)/) {
($1 =~ /(\d+)/ && $1 && $1>0) or &config_error($line,
- "invalid timeout value");
+ "invalid check timeout value");
$CHECKTIMEOUT = $1;
} elsif ($_ =~ /^connecttimeout\s*=\s*(.*)/) {
($1 =~ /(\d+)/ && $1 && $1>0) or &config_error($line,
- "invalid timeout value");
+ "invalid connect timeout value");
$CONNECTTIMEOUT = $1;
} elsif ($_ =~ /^negotiatetimeout\s*=\s*(.*)/) {
($1 =~ /(\d+)/ && $1 && $1>0) or &config_error($line,
- "invalid timeout value");
+ "invalid negotiate timeout value");
$NEGOTIATETIMEOUT = $1;
} elsif ($_ =~ /^checkinterval\s*=\s*(.*)/) {
$1 =~ /(\d+)/ && $1 or &config_error($line,
- "invalid checkinterval value");
+ "invalid check interval value");
$CHECKINTERVAL = $1;
} elsif ($_ =~ /^fallback\s*=\s*(.*)/) {
my $tcp = &ld_gethostservbyname($1, "tcp");
------------------------------
_______________________________________________
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 34
********************************************
