dovecot-2.2: director: When we find unwanted connection, wait fo...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.2/rev/dbe6d05fd595
changeset: 14575:dbe6d05fd595
user:      Timo Sirainen <tss at iki.fi>
date:      Sun May 20 03:08:01 2012 +0300
description:
director: When we find unwanted connection, wait for 10s for it to disconnect us, not 10ms.

diffstat:

 src/director/director-connection.c |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 1c2c1d75d3b2 -r dbe6d05fd595 src/director/director-connection.c
--- a/src/director/director-connection.c	Sun May 20 02:41:08 2012 +0300
+++ b/src/director/director-connection.c	Sun May 20 03:08:01 2012 +0300
@@ -70,7 +70,7 @@
 /* If outgoing director connection exists for less than this many seconds,
    mark the host as failed so we won't try to reconnect to it immediately */
 #define DIRECTOR_SUCCESS_MIN_CONNECT_SECS 40
-#define DIRECTOR_WAIT_DISCONNECT_MSECS 10
+#define DIRECTOR_WAIT_DISCONNECT_SECS 10
 
 #if DIRECTOR_CONNECTION_DONE_TIMEOUT_MSECS <= DIRECTOR_CONNECTION_PING_TIMEOUT_MSECS
 #  error DIRECTOR_CONNECTION_DONE_TIMEOUT_MSECS is too low
@@ -187,7 +187,7 @@
 	o_stream_uncork(conn->output);
 
 	conn->to_disconnect =
-		timeout_add(DIRECTOR_WAIT_DISCONNECT_MSECS,
+		timeout_add(DIRECTOR_WAIT_DISCONNECT_SECS*1000,
 			    director_connection_wait_timeout, conn);
 }