imapc: Change imapc_connection_retry_interval setting to be in milliseconds.

diff --git a/src/lib-storage/index/imapc/imapc-settings.c b/src/lib-storage/index/imapc/imapc-settings.c
index e89917dc564636956c11d5d955886b9446502dfd..170238d5d8def0abe7b3950df3c6599aa7c45614 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-settings.c
+++ b/src/lib-storage/index/imapc/imapc-settings.c
@@ -31,7 +31,7 @@ static const struct setting_define imapc_setting_defines[] = {
        DEF(SET_TIME, imapc_cmd_timeout),
        DEF(SET_TIME, imapc_max_idle_time),
        DEF(SET_UINT, imapc_connection_retry_count),
-       DEF(SET_TIME, imapc_connection_retry_interval),
+       DEF(SET_TIME_MSECS, imapc_connection_retry_interval),
        DEF(SET_SIZE, imapc_max_line_length),
 
        DEF(SET_STR, pop3_deleted_flag),
@@ -57,7 +57,7 @@ static const struct imapc_settings imapc_default_settings = {
        .imapc_cmd_timeout = 5*60,
        .imapc_max_idle_time = 60*29,
        .imapc_connection_retry_count = 1,
-       .imapc_connection_retry_interval = 1,
+       .imapc_connection_retry_interval = 1000,
        .imapc_max_line_length = 0,
 
        .pop3_deleted_flag = ""

diff --git a/src/lib-storage/index/imapc/imapc-storage.c b/src/lib-storage/index/imapc/imapc-storage.c
index d8323ac590a4731495e59917b17f36c448c5fd85..db32b6695f3f7588ad0311739b9148a005952037 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-storage.c
+++ b/src/lib-storage/index/imapc/imapc-storage.c
@@ -305,7 +305,7 @@ int imapc_storage_client_create(struct mail_namespace *ns,
        set.use_proxyauth = (imapc_set->parsed_features & IMAPC_FEATURE_PROXYAUTH) != 0;
        set.cmd_timeout_msecs = imapc_set->imapc_cmd_timeout * 1000;
        set.connect_retry_count = imapc_set->imapc_connection_retry_count;
-       set.connect_retry_interval_msecs = imapc_set->imapc_connection_retry_interval*1000;
+       set.connect_retry_interval_msecs = imapc_set->imapc_connection_retry_interval;
        set.max_idle_time = imapc_set->imapc_max_idle_time;
        set.max_line_length = imapc_set->imapc_max_line_length;
        set.dns_client_socket_path = *ns->user->set->base_dir == '\0' ? "" :