🔧 Make Timelion server send error details to client

elastic · Sep 21, 2021 · e82616a · e82616a
1 parent 4681a80
commit e82616a
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 11 deletions.
diff --git a/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts b/src/plugins/vis_types/timelion/public/helpers/timelion_request_handler.ts
@@ -120,7 +120,7 @@ export function getTimelionRequestHandler({
         const err = new Error(
           `${i18n.translate('timelion.requestHandlerErrorTitle', {
             defaultMessage: 'Timelion request error',
-          })}: ${e.body.title} ${e.body.message}`
+          })}:${e.body.title ? ' ' + e.body.title : ''} ${e.body.message}`
         );
         err.stack = e.stack;
         throw err;

diff --git a/src/plugins/vis_types/timelion/server/handlers/chain_runner.js b/src/plugins/vis_types/timelion/server/handlers/chain_runner.js
@@ -25,7 +25,15 @@ export default function chainRunner(tlConfig) {
   let sheet;
 
   function throwWithCell(cell, exception) {
-    throw new Error(' in cell #' + (cell + 1) + ': ' + exception.message);
+    throw new Error(
+      i18n.translate('timelion.serverSideErrors.errorInCell', {
+        defaultMessage: ' in cell #{number}: {message}',
+        values: {
+          number: cell + 1,
+          message: exception.message,
+        },
+      })
+    );
   }
 
   // Invokes a modifier function, resolving arguments into series as needed

diff --git a/src/plugins/vis_types/timelion/server/routes/run.ts b/src/plugins/vis_types/timelion/server/routes/run.ts
@@ -94,15 +94,18 @@ export function runRoute(
         allowedGraphiteUrls: configManager.getGraphiteUrls(),
         esShardTimeout: configManager.getEsShardTimeout(),
       });
-      const chainRunner = chainRunnerFn(tlConfig);
-      const sheet = await Bluebird.all(chainRunner.processRequest(request.body));
-
-      return response.ok({
-        body: {
-          sheet,
-          stats: chainRunner.getStats(),
-        },
-      });
+      try {
+        const chainRunner = chainRunnerFn(tlConfig);
+        const sheet = await Bluebird.all(chainRunner.processRequest(request.body));
+        return response.ok({
+          body: {
+            sheet,
+            stats: chainRunner.getStats(),
+          },
+        });
+      } catch (e) {
+        return response.badRequest({ body: { message: e.message } });
+      }
     })
   );
 }