@autofleet/node-common 1.1.31 → 1.1.36

package/logger/index.js

@@ -1,7 +1,4 @@
 const winston = require('winston');
-const { LoggingWinston } = require('@google-cloud/logging-winston');
-
-const loggingWinston = new LoggingWinston();
 
 const { createLogger } = winston;
 require('dotenv').config();
@@ -22,12 +19,29 @@ const getLevel = (logLevel) => {
   return 'debug';
 };
 
+const enumerateErrorFormat = winston.format((info) => {
+  if (info.message instanceof Error) {
+    info.message = Object.assign({ // eslint-disable-line 
+      message: info.message.message,
+      stack: info.message.stack,
+    }, info.message);
+  }
+  if (info instanceof Error) {
+    return Object.assign({
+      message: info.message,
+      stack: info.stack,
+    }, info);
+  }
+  return info;
+});
+
 const getFormat = () => {
   if (env.NODE_ENV === 'producation') {
     return winston.format.json();
   }
 
   return winston.format.combine(
+    enumerateErrorFormat(),
     winston.format.splat(),
     winston.format.colorize(),
     winston.format.simple(),
@@ -38,7 +52,7 @@ const createLoggerInstance = (level, transports) => {
   const logger = createLogger({
     level,
     format: getFormat(),
-    transports: [new winston.transports.Console(), loggingWinston],
+    transports: [new winston.transports.Console()],
     exceptionHandlers: transports,
     exitOnError: false,
   });

package/network/index.js

@@ -51,9 +51,9 @@ module.exports = class Network {
     const logger = Logger();
     this.axios.interceptors.request.use((request) => {
       logger.info(`Start Request: [${request.method.toUpperCase()}] ${request.baseURL} ${request.url}`, {
-        query: request.params,
-        body: request.data,
         headers: request.headers,
+        query: request.query,
+        body: request.body,
       });
       return request;
     });
@@ -62,12 +62,8 @@ module.exports = class Network {
       logger.info(`Finish Request: [${response.config.method.toUpperCase()} ${response.config.url}`);
       return response;
     }, (error) => {
-      if (error && error.response && error.response.data) {
-        logger.error(`Finish Request with error: ${error.response.data.message}`);
-      } else {
-        logger.error(`Finish Request with error: ${error}`);
-      }
-      // throw error; // TODO: think about that.. for its break the vehiclems tests
+      logger.error('Finish Request with error', { status: error.status, data: error.response && error.response.data });
+      throw error;
     });
   }
 

package/network/index.test.js

@@ -30,13 +30,14 @@ describe('Network', () => {
 
   it('Getting 404', async () => {
     const n = new Network({ serviceUrl: 'https://www.apple.com' });
-    const response = await n.get('/resource', {
+
+    const action = async () => n.get('/resource', {
       query: {
         a: 'b',
       },
     });
-    expect(response).toBeDefined();
-    expect(response.data).not.toBeDefined();
+
+    expect(action()).rejects.toThrow(Error);
   });
 
   test('Retry 1 time', async () => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.1.31",
+  "version": "1.1.36",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -22,9 +22,9 @@
   },
   "homepage": "https://gitlab.com/AutoFleet/node-common#README",
   "dependencies": {
+    "@google-cloud/logging-winston": "^0.10.1",
     "@google-cloud/monitoring": "^0.6.0",
     "@google-cloud/profiler": "^0.2.0",
-    "@google-cloud/logging-winston": "^0.9.1",
     "@google-cloud/pubsub": "^0.19.0",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",

package/settings/index.js

@@ -47,7 +47,7 @@ module.exports = class SettingsManager {
       });
       networkValue = networkReponse.data.value;
     } catch (error) {
-      logger.error('Cant get setting from network', error);
+      logger.error('Cant get setting from network');
     }
 
     const returnValue = typeof networkValue !== 'undefined' ? networkValue : defaultValue;