Improve the ratelimit examples. The delay example was broken - it needed

[users/heiko/exim.git] / doc / doc-txt / NewStuff

diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index cd69ef60e605c799e947c7dca98f2ac3f44aaa91..556094ddfbcf655e141c78c32ecdde3f986262b4 100644 (file)
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.71 2005/09/15 12:22:41 fanf2 Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.75 2005/09/22 12:58:14 fanf2 Exp $
 
 New Features in Exim
 --------------------
@@ -155,6 +155,19 @@ TF/01 There's a new script in util/ratelimit.pl which extracts sending
       rates from log files, to assist with choosing appropriate settings
       when deploying the ratelimit ACL condition.
 
+PH/13 A new letter, "H", is available in retry parameter sets. It is similar
+      to "G" (geometric increasing time intervals), except that the interval
+      before the next retry is randomized. Each time, the previous interval is
+      multiplied by the factor in order to get a maximum for the next interval.
+      The mininum interval is the first argument of the parameter, and an
+      actual interval is chosen randomly between them. Such a rule has been
+      found to be helpful in cluster configurations when all the members of the
+      cluster restart at once, and may synchronize their queue processing
+      times.
+
+PH/14 The options never_users, trusted_users, admin_groups, and trusted_groups
+      are now expanded when the configuration file is read.
+
 
 Exim version 4.52
 -----------------
@@ -340,7 +353,12 @@ TF/04 There is a new ratelimit ACL condition which can be used to measure
       updated. The effect of this is that Exim measures the client's average
       rate of attempts to send email, which can be much higher than the
       maximum. If the client is over the limit it will be subjected to
-      counter-measures until it slows down below the maximum rate.
+      counter-measures until it slows down below the maximum rate. The
+      smoothing period determines the time it takes for a high sending rate
+      to decay exponentially to 37% of its peak value, which means that you
+      can work out the time (the number of smoothing periods) that a client
+      is subjected to counter-measures after an over-limit burst with the
+      formula ln(peakrate/maxrate).
 
       The leaky option means that the client's recorded rate is not updated
       if it is above the limit. The effect of this is that Exim measures the
@@ -363,13 +381,12 @@ TF/04 There is a new ratelimit ACL condition which can be used to measure
         # Log all senders' rates
         warn
           ratelimit = 0 / 1h / strict
-          log_message = \
-            Sender rate $sender_rate > $sender_rate_limit / $sender_rate_period
+          log_message = Sender rate $sender_rate / $sender_rate_period
 
         # Slow down fast senders
         warn
           ratelimit = 100 / 1h / per_rcpt / strict
-          delay     = ${eval: 10 * ($sender_rate - $sender_rate_limit) }
+          delay     = ${eval: $sender_rate - $sender_rate_limit }s
 
         # Keep authenticated users under control
         deny
@@ -383,8 +400,8 @@ TF/04 There is a new ratelimit ACL condition which can be used to measure
         # Restrict incoming rate from each host, with a default rate limit
         # set using a macro and special cases looked up in a table.
         defer
-          message = Sender rate $sender_rate exceeds \
-                    $sender_rate_limit messages per $sender_rate_period
+          message = Sender rate exceeds $sender_rate_limit \
+                    messages per $sender_rate_period
           ratelimit = ${lookup {$sender_host_address} \
                         cdb {DB/ratelimits.cdb} \
                         {$value} {RATELIMIT} }