diff --git a/lib/searchkick/middleware.rb b/lib/searchkick/middleware.rb index e2be926..9b41aeb 100644 --- a/lib/searchkick/middleware.rb +++ b/lib/searchkick/middleware.rb @@ -9,7 +9,9 @@ module Searchkick elsif path.end_with?("/_msearch") # assume no concurrent searches for timeout for now searches = env[:request_body].count("\n") / 2 - env[:request][:timeout] = Searchkick.search_timeout * searches + # do not allow timeout to exceed Searchkick.timeout + timeout = [Searchkick.search_timeout * searches, Searchkick.timeout].min + env[:request][:timeout] = timeout end @app.call(env) end -- libgit2 0.21.0