fts: fts_indexer_input_args() - Fix client-side timeout

Client side timeout now just triggers if there is period long enough
where the server doesn't send updates. This works just because the
server is not pushing the updates properly.

The client must timeout BOTH if the server is unresponsive AND if
the server sends updates but the overall elapsed time exceedes.

diff --git a/src/plugins/fts/fts-indexer.c b/src/plugins/fts/fts-indexer.c
index 79d4a4d7af543bc827fc1803c1cb137f7d78e660..4372ab8108e734044404c2946846d5a1097cc300 100644 (file)
--- a/src/plugins/fts/fts-indexer.c
+++ b/src/plugins/fts/fts-indexer.c
@@ -34,6 +34,8 @@ struct fts_indexer_context {
        bool completed:1;
 };
 
+static void fts_indexer_idle_timeout(struct connection *conn);
+
 static void fts_indexer_notify(struct fts_indexer_context *ctx)
 {
        unsigned long long elapsed_msecs, est_total_msecs;
@@ -167,8 +169,14 @@ fts_indexer_input_args(struct connection *conn, const char *const *args)
                return -1;
        }
        ctx->percentage = percentage;
+       time_t elapsed = ioloop_time - ctx->search_start_time.tv_sec;
        if (ctx->percentage == 100)
                ctx->completed = TRUE;
+       else if (ctx->conn.input_idle_timeout_secs > 0 &&
+                elapsed > ctx->conn.input_idle_timeout_secs) {
+               fts_indexer_idle_timeout(&ctx->conn);
+               return -1;
+       }
        return 1;
 }