lib-imap-client: Remove hardcoded IMAPC_CONNECT_RETRY_WAIT_MSECS

We have a setting for it now.

diff --git a/src/lib-imap-client/imapc-connection.c b/src/lib-imap-client/imapc-connection.c
index 20b2ad65f9e006b5a31eb0089b7b17c7f5970006..08df414d50da5369b33c0fdc571122e57b9bf4cd 100644 (file)
--- a/src/lib-imap-client/imapc-connection.c
+++ b/src/lib-imap-client/imapc-connection.c
@@ -1634,7 +1634,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);
@@ -1718,7 +1718,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 46632df91833b346e5a28e7de09e4b089767b096..5afaca7348b10d4e206881406a5d37f263d02b8f 100644 (file)
--- 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;