Use same message for logs & HTTP response

elastic · Sep 9, 2020 · fdaf588 · fdaf588
1 parent e05362c
commit fdaf588
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/x-pack/plugins/ingest_manager/server/errors/handlers.test.ts b/x-pack/plugins/ingest_manager/server/errors/handlers.test.ts
@@ -17,7 +17,7 @@ import {
 } from './index';
 
 const LegacyESErrors = errors as Record<string, any>;
-type ITestEsErrorsFnParams = [errorCode: string, error: any, bodyMessage: string];
+type ITestEsErrorsFnParams = [errorCode: string, error: any, expectedMessage: string];
 
 describe('defaultIngestErrorHandler', () => {
   let mockContract: ReturnType<typeof createAppContextStartContractMock>;
@@ -33,7 +33,7 @@ describe('defaultIngestErrorHandler', () => {
   });
 
   async function testEsErrorsFn(...args: ITestEsErrorsFnParams) {
-    const [, error, bodyMessage] = args;
+    const [, error, expectedMessage] = args;
     jest.clearAllMocks();
     const response = httpServerMock.createResponseFactory();
     await defaultIngestErrorHandler({ error, response });
@@ -43,12 +43,12 @@ describe('defaultIngestErrorHandler', () => {
     expect(response.customError).toHaveBeenCalledTimes(1);
     expect(response.customError).toHaveBeenCalledWith({
       statusCode: error.status,
-      body: { message: bodyMessage },
+      body: { message: expectedMessage },
     });
 
     // logging
     expect(mockContract.logger?.error).toHaveBeenCalledTimes(1);
-    expect(mockContract.logger?.error).toHaveBeenCalledWith(error.message);
+    expect(mockContract.logger?.error).toHaveBeenCalledWith(expectedMessage);
   }
 
   describe('use the HTTP error status code provided by LegacyESErrors', () => {

diff --git a/x-pack/plugins/ingest_manager/server/errors/handlers.ts b/x-pack/plugins/ingest_manager/server/errors/handlers.ts
@@ -64,13 +64,14 @@ export const defaultIngestErrorHandler: IngestErrorHandler = async ({
   if (isLegacyESClientError(error)) {
     // there was a problem communicating with ES (e.g. via `callCluster`)
     // only log the message
-    logger.error(error.message);
-
     const message =
       error?.path && error?.response
         ? // if possible, return the failing endpoint and its response
           `${error.message} response from ${error.path}: ${error.response}`
         : error.message;
+
+    logger.error(message);
+
     return response.customError({
       statusCode: error?.statusCode || error.status,
       body: { message },