diff --git a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts index e52dc775e0862f..00b8cfdeb52e5c 100644 --- a/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/eql_search/eql_search_strategy.ts @@ -89,15 +89,17 @@ export const eqlSearchStrategyProvider = ( ); }; - const cancel = () => { + const cancel = async () => { if (!id) return; - cancelAsyncSearch(id, esClient).catch((e) => { + try { + await cancelAsyncSearch(id, esClient); + } catch (e) { // A 404 means either this search request does not exist, or that it is already cancelled if (e.meta?.statusCode === 404) return; // Log all other (unexpected) error messages logger.error(`cancelEqlSearch error: ${e.message}`); - }); + } }; return pollSearch(search, cancel, { diff --git a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts index e5c92d19168b6f..4efd28b4c1c554 100644 --- a/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/ese_search/ese_search_strategy.ts @@ -87,15 +87,17 @@ export const enhancedEsSearchStrategyProvider = ( ); }; - const cancel = () => { + const cancel = async () => { if (!id || options.isStored) return; - cancelAsyncSearch(id, esClient).catch((e) => { + try { + await cancelAsyncSearch(id, esClient); + } catch (e) { // A 404 means either this search request does not exist, or that it is already cancelled if (e.meta?.statusCode === 404) return; // Log all other (unexpected) error messages logger.error(`cancelAsyncSearch error: ${e.message}`); - }); + } }; return pollSearch(search, cancel, { diff --git a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts index 7a850049ec30a0..9e04675d12247f 100644 --- a/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts +++ b/src/plugins/data/server/search/strategies/sql_search/sql_search_strategy.ts @@ -87,15 +87,17 @@ export const sqlSearchStrategyProvider = ( ); }; - const cancel = () => { + const cancel = async () => { if (!id) return; - cancelAsyncSearch(id, esClient).catch((e) => { + try { + await cancelAsyncSearch(id, esClient); + } catch (e) { // A 404 means either this search request does not exist, or that it is already cancelled if (e.meta?.statusCode === 404) return; // Log all other (unexpected) error messages logger.error(`cancelSqlSearch error: ${e.message}`); - }); + } }; return pollSearch(search, cancel, {