Merge pull request #38 from emarsys/issue/37

feat(log): switch logger framework

lib/request.js

@@ -4,7 +4,7 @@ const Escher = require('escher-auth');
 const Options = require('./requestOption');
 const Wrapper = require('./wrapper');
 const SuiteRequestError = require('./requestError');
-const logger = require('logentries-logformat')('suiterequest');
+const logger = require('@emartech/json-logger')('suiterequest');
 
 class SuiteRequest {
 
@@ -44,7 +44,7 @@ class SuiteRequest {
     const payload = data ? this._getPayload(data) : '';
     const signedOptions = this._signRequest(options, payload);
 
-    logger.log('send', this._getLogParameters(options));
+    logger.info('send', this._getLogParameters(options));
     return this._getRequestFor(signedOptions, payload).send();
   }
 

lib/wrapper.js

@@ -1,8 +1,8 @@
 'use strict';
 
 const SuiteRequestError = require('./requestError');
-const logger = require('logentries-logformat')('suiterequest');
-const debugLogger = require('logentries-logformat')('suiterequest-debug');
+const logger = require('@emartech/json-logger')('suiterequest');
+const debugLogger = require('@emartech/json-logger')('suiterequest-debug');
 const axios = require('axios');
 
 class RequestWrapper {
@@ -11,9 +11,11 @@ class RequestWrapper {
     this.requestOptions = requestOptions;
     this.protocol = protocol;
     this.payload = payload;
-    debugLogger.log('request_options', requestOptions);
-    debugLogger.log('protocol', protocol);
-    debugLogger.log('payload', payload);
+    debugLogger.info('request_options', {
+      request_options: requestOptions,
+      protocol: protocol,
+      payload: payload
+    });
   }
 
   send() {
@@ -41,7 +43,7 @@ class RequestWrapper {
       )
       .then(response => {
         const endTime = this._getTime();
-        logger.success('send', this._getLogParameters({ time: startTime - endTime }));
+        logger.info('send', this._getLogParameters({ time: startTime - endTime }));
 
         return this._handleResponse(response);
       });
@@ -57,14 +59,15 @@ class RequestWrapper {
   }
 
   _handleResponseError(error) {
-    logger.error('fatal_error', error.message, this._getLogParameters());
+    logger.fromError('fatal_error', error, this._getLogParameters());
     throw new SuiteRequestError(error.message, 500);
   }
 
   _handleResponse(response) {
     if (response.statusCode >= 400) {
-      logger.error('server_error', response.body.replyText, this._getLogParameters({
-        code: response.statusCode
+      logger.error('server_error',this._getLogParameters({
+        code: response.statusCode,
+        reply_text: response.body.replyText
       }));
       throw new SuiteRequestError(
         'Error in http response (status: ' + response.statusCode + ')',
@@ -74,7 +77,7 @@ class RequestWrapper {
     }
 
     if (!this.requestOptions.allowEmptyResponse && !response.body) {
-      logger.error('server_error', 'empty response data', this._getLogParameters());
+      logger.error('server_error empty response data', this._getLogParameters());
       throw new SuiteRequestError('Empty http response', 500, response.statusMessage);
     }
 
@@ -118,7 +121,7 @@ class RequestWrapper {
       headers: headers,
       timeout: this.requestOptions.timeout
     };
-    debugLogger.log('wrapper_options', reqOptions);
+    debugLogger.info('wrapper_options', reqOptions);
 
     if (this.payload) {
       reqOptions.body = this.payload;
@@ -135,7 +138,7 @@ class RequestWrapper {
     try {
       return JSON.parse(response.body);
     } catch (ex) {
-      logger.error('fatal_error', ex, this._getLogParameters());
+      logger.fromError('fatal_error', ex, this._getLogParameters());
       throw new SuiteRequestError(ex.message, 500);
     }
   }

package.json

@@ -26,9 +26,9 @@
   },
   "homepage": "https://github.com/emartech/escher-suiteapi-js",
   "dependencies": {
+    "@emartech/json-logger": "3.0.1",
     "axios": "0.17.1",
-    "escher-auth": "1.0.0",
-    "logentries-logformat": "0.2.0"
+    "escher-auth": "1.0.0"
   },
   "devDependencies": {
     "chai": "4.1.2",