From df066db05971837aa1cd9ef45d743a9add64ad2a Mon Sep 17 00:00:00 2001 From: Jakob Pupke Date: Thu, 17 May 2018 23:24:53 +0200 Subject: [PATCH] clean up usage of logger, fix bug where logger is undefined --- packages/rocketchat-api/server/api.js | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/rocketchat-api/server/api.js b/packages/rocketchat-api/server/api.js index db08016e8c5f..d3445d4f5fe1 100644 --- a/packages/rocketchat-api/server/api.js +++ b/packages/rocketchat-api/server/api.js @@ -5,7 +5,6 @@ const logger = new Logger('API', {}); class API extends Restivus { constructor(properties) { super(properties); - this.logger = new Logger(`API ${ properties.version ? properties.version : 'default' } Logger`, {}); this.authMethods = []; this.fieldSeparator = '.'; this.defaultFieldsToExclude = { @@ -153,12 +152,12 @@ class API extends Restivus { version, entrypoint: route }); - this.logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`); + logger.debug(`${ this.request.method.toUpperCase() }: ${ this.request.url }`); let result; try { result = originalAction.apply(this); } catch (e) { - this.logger.debug(`${ method } ${ route } threw an error:`, e.stack); + logger.debug(`${ method } ${ route } threw an error:`, e.stack); result = RocketChat.API.v1.failure(e.message, e.error); } @@ -176,7 +175,7 @@ class API extends Restivus { } //Allow the endpoints to make usage of the logger which respects the user's settings - endpoints[method].logger = this.logger; + endpoints[method].logger = logger; }); }