# HG changeset patch # User Sean E. Millichamp # Date 1242400953 14400 # Node ID bb6b83aafa92492e70658f3a9dfc813a910be64a # Parent fdfc9ac249a2497eda1407c88bef5ce102086cf3 ldirectord: Add checkcount deprecation warnings and minor failurecount doc cleanup. Signed-Off-By: Sean E. Millichamp diff -r fdfc9ac249a2 -r bb6b83aafa92 ldirectord/ldirectord.in --- a/ldirectord/ldirectord.in Mon May 11 14:44:12 2009 -0400 +++ b/ldirectord/ldirectord.in Fri May 15 11:22:33 2009 -0400 @@ -155,6 +155,9 @@ BI +This option is deprecated and slated for removal in a future version. +Please see the 'failurecount' option. + The number of times a check will be attmpted before it is considered to have failed. Only works with ping checks. Note that the checktimeout/negotiatetimeout is additive, so if a connect check is used, @@ -168,9 +171,9 @@ BI The number of consecutive times a failure will have to be reported by a -check before the realserver is removed from the kernel's LVS table. A -value of 1 will have the realserver removed on the first failure. A -successful check will reset the failure counter to 0. +check before the realserver is considered to have failed. A +value of 1 will have the realserver considered failed on the first failure. +A successful check will reset the failure counter to 0. If defined in a virtual server section then the global value is overriden. @@ -1293,6 +1296,7 @@ } elsif ($rcmd =~ /^checkcount\s*=\s*(.*)/){ $1 =~ /(\d+)/ && $1 or &config_error($line, "invalid check count"); $vsrv{checkcount} = $1; + &config_warn($line, "checkcount option is deprecated and slated for removal. please see 'failurecount'"); } elsif ($rcmd =~ /^failurecount\s*=\s*(.*)/){ $1 =~ /(\d+)/ && $1 or &config_error($line, "invalid failure count"); $vsrv{failurecount} = $1; @@ -1504,6 +1508,7 @@ $1 =~ /(\d+)/ && $1 or &config_error($line, "invalid check count value"); $CHECKCOUNT = $1; + &config_warn($line, "checkcount option is deprecated and slated for removal. please see 'failurecount'"); } elsif ($linedata =~ /^failurecount\s*=\s*(.*)/) { $1 =~ /(\d+)/ && $1 or &config_error($line, "invalid failure count value");