@autofleet/node-common 1.2.8 → 1.2.9

package/logger/index.js

@@ -1,4 +1,7 @@
 const winston = require('winston');
+const {LoggingWinston} = require('@google-cloud/logging-winston');
+ 
+const loggingWinston = new LoggingWinston();
 
 const { createLogger } = winston;
 require('dotenv').config();
@@ -52,7 +55,7 @@ const getFormat = () => {
 };
 
 const createLoggerInstance = (level, exceptionHandlers) => {
-  const transports = [new winston.transports.Console()];
+  const transports = [new winston.transports.Console(), loggingWinston];
 
   const logger = createLogger({
     level,
@@ -77,6 +80,9 @@ const createLoggerInstance = (level, exceptionHandlers) => {
       },
     });
   };
+
+  const mw = await lw.express.makeMiddleware(logger);
+  
   if (env.NODE_ENV !== 'production') {
     logger.httpMorganInfo = undefined;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autofleet/node-common",
-  "version": "1.2.8",
+  "version": "1.2.9",
   "description": "",
   "scripts": {
     "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,7 +23,7 @@
   },
   "homepage": "https://github.com/Autofleet/node-common",
   "dependencies": {
-    "@google-cloud/logging-winston": "^0.10.2",
+    "@google-cloud/logging-winston": "^2.0.1",
     "@google-cloud/pubsub": "^0.20.1",
     "axios": "^0.18.0",
     "axios-retry": "^3.1.0",
@@ -38,7 +38,7 @@
     "qs": "^6.5.2",
     "timekeeper": "^2.1.2",
     "weak": "^1.0.1",
-    "winston": "^3.0.0",
+    "winston": "^3.2.1",
     "ws": "^5.2.1"
   },
   "devDependencies": {

package/router/index.js

@@ -17,11 +17,17 @@ const AfEntryPoint = func => async (req, res, next) => {
   try {
     await func(req, res, next);
   } catch (e) {
-    logger.error(e.message);
-    if (e.statusCode && e.statusCode < 500) {
-      return res.status(400).json({ error: e.message, status: 'ERROR' });
+    if(e.array) {
+      logger.error('Validation error', e.array())
+      res.status(422);
+      res.json({
+        validationErrors: e.array(),
+      })
+      next();
+    } else {
+      logger.error(e)
+      next(e);
     }
-    next(e);
   }
 };
 

package/settings/map.js

@@ -395,11 +395,4 @@ module.exports = {
     defaultValue: 'GBP',
     context: 'ride',
   },
-  BUFFER: {
-    name: 'Buffer around a polygon of a route',
-    description: 'The buffer around a polygon of a route to calculate tiled from',
-    type: 'number',
-    defaultValue: 1,
-    context: 'matching',
-  },
 };