From ed10bddd8796eb0c49ca414d679188e58e52ec9f Mon Sep 17 00:00:00 2001 From: Timo Sirainen Date: Mon, 10 Apr 2017 17:06:34 +0300 Subject: [PATCH] lib-imap-client: Remove hardcoded IMAPC_CONNECT_RETRY_WAIT_MSECS We have a setting for it now. --- src/lib-imap-client/imapc-connection.c | 4 ++-- src/lib-imap-client/imapc-connection.h | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c index df9d4d7d94..bcf932a368 100644 --- a/src/lib-imap-client/imapc-connection.c +++ b/src/lib-imap-client/imapc-connection.c @@ -1636,7 +1636,7 @@ static void imapc_connection_connected(struct imapc_connection *conn) imapc_connection_try_reconnect(conn, t_strdup_printf( "connect(%s, %u) failed: %s", net_ip2addr(ip), conn->client->set.port, - strerror(err)), IMAPC_CONNECT_RETRY_WAIT_MSECS); + strerror(err)), conn->client->set.connect_retry_interval_msecs); return; } conn->io = io_add(conn->fd, IO_READ, imapc_connection_input, conn); @@ -1720,7 +1720,7 @@ static void imapc_connection_connect_next_ip(struct imapc_connection *conn) net_ip2addr(ip), conn->client->set.port); if (conn->prev_connect_idx+1 == conn->ips_count) { imapc_connection_try_reconnect(conn, "No more IP address(es) to try", - IMAPC_CONNECT_RETRY_WAIT_MSECS); + conn->client->set.connect_retry_interval_msecs); return; } } diff --git a/src/lib-imap-client/imapc-connection.h b/src/lib-imap-client/imapc-connection.h index 46632df918..5afaca7348 100644 --- a/src/lib-imap-client/imapc-connection.h +++ b/src/lib-imap-client/imapc-connection.h @@ -8,9 +8,6 @@ #define IMAPC_THROTTLE_DEFAULT_MAX_MSECS (16*1000) #define IMAPC_THROTTLE_DEFAULT_SHRINK_MIN_MSECS 500 -/* If connect() fails, how long should we wait before reconnection */ -#define IMAPC_CONNECT_RETRY_WAIT_MSECS 1000 - struct imapc_client; struct imapc_connection;