fts: Rename fts_index_timeout setting to fts_search_timeout

It's describes the behavior better.

diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c
index 263480db02ae7c29fb1780ea1ebfae3ac4a98ee9..9f3ad2f32bd2ce6a301876d302dd777f75d045af 100644 (file)
--- a/src/plugins/fts/fts-indexer.c
+++ b/src/plugins/fts/fts-indexer.c
@@ -280,7 +280,7 @@ int fts_indexer_init(struct fts_backend *backend, struct mailbox *box,
        ctx->ioloop = io_loop_create();
        ctx->connection_list = connection_list_init(&indexer_client_set,
                                                    &indexer_client_vfuncs);
-       ctx->conn.input_idle_timeout_secs = fset->index_timeout;
+       ctx->conn.input_idle_timeout_secs = fset->search_timeout;
        connection_init_client_unix(ctx->connection_list, &ctx->conn,
                                    path);
        ret = connection_client_connect(&ctx->conn);

diff --git a/src/plugins/fts/fts-settings.c b/src/plugins/fts/fts-settings.c
index cb8c74cdd61a26cdaa802526d9d1976fa0ef4505..ea9612f4a49b9b6440292e19f59eae5817a94bb9 100644 (file)
--- a/src/plugins/fts/fts-settings.c
+++ b/src/plugins/fts/fts-settings.c
@@ -26,7 +26,7 @@ static const struct setting_define fts_setting_defines[] = {
        DEF(BOOL,    search_read_fallback),
        DEF(BOOLLIST,header_excludes),
        DEF(BOOLLIST,header_includes),
-       DEF(TIME,    index_timeout),
+       DEF(TIME,    search_timeout),
        DEF(SIZE,    message_max_size),
        SETTING_DEFINE_LIST_END
 };
@@ -57,7 +57,7 @@ static const struct fts_settings fts_default_settings = {
        .search_add_missing = FTS_SEARCH_ADD_MISSING_BODY_SEARCH_ONLY":yes",
        .search_read_fallback = TRUE,
 
-       .index_timeout = 0,
+       .search_timeout = 0,
        .message_max_size = SET_SIZE_UNLIMITED,
 };
 

diff --git a/src/plugins/fts/fts-settings.h b/src/plugins/fts/fts-settings.h
index 4e07a8f6842d24a5733851f0c1aaaa477688dc99..b23a551edf63aa80378e383a76ce1b18580157f6 100644 (file)
--- a/src/plugins/fts/fts-settings.h
+++ b/src/plugins/fts/fts-settings.h
@@ -26,7 +26,7 @@ struct fts_settings {
        const char *search_add_missing;
        bool search_read_fallback;
        unsigned int autoindex_max_recent_msgs;
-       unsigned int index_timeout;
+       unsigned int search_timeout;
        uoff_t message_max_size;
        bool autoindex;