Implement daemon_startup_{retries,sleep} to control startup retrying.

4 files changed, 14 insertions, 10 deletions

diff --git a/doc/doc-misc/WishList b/doc/doc-misc/WishList
index adc8b0bba..7624940c4 100644
--- a/doc/doc-misc/WishList
+++ b/doc/doc-misc/WishList
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-misc/WishList,v 1.39 2005/06/16 15:48:58 ph10 Exp $
+$Cambridge: exim/doc/doc-misc/WishList,v 1.40 2005/06/21 14:14:55 ph10 Exp $
 
 EXIM 4 WISH LIST
 ----------------
@@ -1881,12 +1881,6 @@ file would contain the complete email. I suppose there may be other scanning
 solutions with a similar requirement."
 ------------------------------------------------------------------------------
 
-(320) 03-Mar-05 T Options to control daemon retry binding
-
-Currently the daemon tries 10 times at 30-second intervals to listen on an IP
-address. The wish is for options to control these numbers.
-------------------------------------------------------------------------------
-
 (321) 07-Mar-05 S Run an ACL on a sync error
 
 ... and possibly "accept" or "deny" it.
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index aea7fe9e8..158929d03 100644
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.165 2005/06/20 13:58:22 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/ChangeLog,v 1.166 2005/06/21 14:14:55 ph10 Exp $
 
 Change log file for Exim from version 4.21
 -------------------------------------------
@@ -172,6 +172,8 @@ PH/22 Fixed some oversights/typos causing bugs when Exim is compiled with
 
       These problems did NOT occur unless DomainKeys support was compiled.
 
+PH/23 Added daemon_startup_retries and daemon_startup_sleep.
+
 
 Exim version 4.51
 -----------------
diff --git a/doc/doc-txt/NewStuff b/doc/doc-txt/NewStuff
index 65b0fc678..0805e0b5b 100644
--- a/doc/doc-txt/NewStuff
+++ b/doc/doc-txt/NewStuff
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/NewStuff,v 1.50 2005/06/16 20:03:43 tom Exp $
+$Cambridge: exim/doc/doc-txt/NewStuff,v 1.51 2005/06/21 14:14:55 ph10 Exp $
 
 New Features in Exim
 --------------------
@@ -342,6 +342,12 @@ TK/02 There are two new expansion items to help with the implementation of
                                sender='${quote_mysql:$sender_address}'} \
                            {$value}fail}}}
 
+PH/04 There are two new options that control the retrying done by the daemon
+      at startup when it cannot immediately bind a socket (typically because
+      the socket is already in use). The default values reproduce what were
+      built-in constants previously: daemon_startup_retries defines the number
+      of retries after the first failure (default 9); daemon_startup_sleep
+      defines the length of time to wait between retries (default 30s).
 
 
 Version 4.51
diff --git a/doc/doc-txt/OptionLists.txt b/doc/doc-txt/OptionLists.txt
index ac1e06a11..53b76d304 100644
--- a/doc/doc-txt/OptionLists.txt
+++ b/doc/doc-txt/OptionLists.txt
@@ -1,4 +1,4 @@
-$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.8 2005/05/03 14:20:00 ph10 Exp $
+$Cambridge: exim/doc/doc-txt/OptionLists.txt,v 1.9 2005/06/21 14:14:55 ph10 Exp $
 
 LISTS OF EXIM OPTIONS
 ---------------------
@@ -140,6 +140,8 @@ create_file                          string          "anywhere"    appendfile
 current_directory                    string          unset         transports        4.00
                                                      unset         queryprogram      4.00
 daemon_smtp_ports                    string          unset         main              1.75  pluralised in 4.21
+daemon_startup_retries               int             9             main              4.52
+daemon_startup_sleep                 time            30s           main              4.52
 data                                 string          unset         redirect          4.00
 data_timeout                         time            5m            smtp
 debug_print                          string*         unset         authenticators    4.00