Clean up cancel methods

elastic · Nov 7, 2023 · b9fcdc3 · b9fcdc3
1 parent 50eb538
commit b9fcdc3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 9 deletions.
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
@@ -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
@@ -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
@@ -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, {