feat: new env vars for logger

configs/babelrc

@@ -2,7 +2,7 @@
  "presets": [
  ["env", {
  "targets": {
- "node": 7.7
+ "node": "7.8"
  },
  "include": [],
  "useBuiltIns": true,

configs/env.sample.config

@@ -7,6 +7,10 @@ NODECUBE_DISABLE_COMPRESS=
 NODECUBE_DISABLE_BODY_PARSER=
 NODECUBE_ENABLE_HEADERS_LOG=
 NODECUBE_ENABLE_RAW_BODY_LOG=
-NODECUBE_ENABLE_VERBOSE_LOG=
+NODECUBE_LOG_LEVEL=info
+NODECUBE_ENABLE_JSON_LOG=
+NODECUBE_ENABLE_COLOR_LOG=
+NODECUBE_ENABLE_READABLE_EXCEPTION_LOG=
+NODECUBE_DISABLE_EXCEPTION_LOG=
 NODECUBE_DISABLE_STAT_API=
 NODECUBE_ENABLE_INSPECT_API=

package.json

@@ -9,7 +9,7 @@
  "license": "MIT",
  "homepage": "https:/dexteryy/nodecube",
  "repository": "https:/dexteryy/nodecube",
- "version": "0.4.1",
+ "version": "0.5.0",
  "main": "index.js",
  "scripts": {
  "prepare": "npm run lint && npm run build",

src/errorResponse.js

@@ -1,29 +1,20 @@
 
-const RE_DATA = /(.*)\[\[(.+?)\]\](.*)/;
-
 export default function errorResponse(req, res) {
- const requestId = req.get('Request-Id');
- return (err = new Error('UNDEFINED ERROR')) => {
- let data = err;
- const message = err.message
- .replace(RE_DATA, ($0, before, json = '', after) => {
- try {
- data = JSON.parse(json) || {};
- } catch (ex) {
- data = err;
- }
- return before + after;
- });
- if (!data.isExpected) {
- if (process.env.NODE_ENV === 'production') {
- logger.error(`[Request-Id: ${requestId}]`, err);
- } else {
- console.error(requestId, err);
- }
+ const requestId = res.get('Request-Id');
+ return (err = {}) => {
+ const {
+ status = -100,
+ isExpected,
+ message = 'UNDEFINED ERROR',
+ meta = {},
+ } = err;
+ if (!isExpected) {
+ logger.error(`[${requestId}] ${status} | ${message}`, meta);
  }
  res.json({
- status: data.status || -100,
+ status,
  message,
+ meta,
  });
  };
 }

src/errorTrigger.js

@@ -3,10 +3,11 @@ export default function errorTrigger({
  status = -101,
  isExpected = true,
  message,
+ ...meta
 }) {
- const errData = JSON.stringify({
+ throw Object.assign(new Error(message), {
  status,
  isExpected,
+ meta,
  });
- throw new Error(`[[${errData}]] ${message}`);
 }

src/httpService.js

@@ -7,6 +7,7 @@ import getRawBody from 'raw-body';
 import contentType from 'content-type';
 import cookieParser from 'cookie-parser';
 import httpLogger from 'morgan';
+import logger from './logger';
 import winston from 'winston';
 import expressWinston from 'express-winston';
 import errorHandler from 'errorhandler';
@@ -18,7 +19,7 @@ import helmet from 'helmet';
 // import passport from 'passport';
 import uuid from 'uuid/v4';
 import corsManager from './corsManager';
-import logger from './logger';
+
 global.logger = logger;
 
 const isProductionEnv = process.env.NODE_ENV === 'production';
@@ -63,7 +64,7 @@ export default function httpService({
  if (process.env.NODECUBE_ENABLE_HEADERS_LOG) {
  server.use((req, res, next) => {
  const rid = res.get('Request-Id');
- logger.info(`[${rid}] headers: ${JSON.stringify(req.headers)}`);
+ logger.info(`[${rid}] HEADERS:`, req.headers);
  next();
  });
  }
@@ -80,9 +81,9 @@ export default function httpService({
  length: req.headers['content-length'],
  encoding,
  }).then(str => {
- logger.info(`[${rid}] raw body: ${str}`);
+ logger.info(`[${rid}] RAW BODY: ${str}`);
  }).catch(err => {
- logger.info(`[${rid}] raw body: Error! ${err.message}`);
+ logger.error(`[${rid}] RAW BODY ERROR: ${err.message}`);
  });
  next();
  });
@@ -167,14 +168,17 @@ export default function httpService({
 
  server.use(expressWinston.errorLogger({
  transports: [
- new winston.transports.Console({
- level: process.env.NODECUBE_ENABLE_VERBOSE_LOG ? 'verbose' : 'info',
- colorize: false,
- json: true,
- prettyPrint: false,
- humanReadableUnhandledException: false,
- }),
+ new winston.transports.Console(logger.consoleConfig),
  ],
+ dynamicMeta(req, res) {
+ const meta = [{
+ requestId: res.get('Request-Id'),
+ }];
+ if (req.user) {
+ meta.push(req.user);
+ }
+ return meta;
+ },
  }));
 
  if (!isProductionEnv) {

src/logger.js

@@ -1,19 +1,17 @@
 
 import winston from 'winston';
 
-const isProductionEnv = process.env.NODE_ENV === 'production';
-
-const consoleConfig = new winston.transports.Console({
- level: process.env.NODECUBE_ENABLE_VERBOSE_LOG ? 'verbose' : 'info',
- colorize: !isProductionEnv,
- json: isProductionEnv,
- prettyPrint: !isProductionEnv,
- humanReadableUnhandledException: !isProductionEnv,
-});
+const consoleConfig = {
+ level: process.env.NODECUBE_LOG_LEVEL || 'info',
+ colorize: !!process.env.NODECUBE_ENABLE_COLOR_LOG,
+ json: !!process.env.NODECUBE_ENABLE_JSON_LOG,
+ handleExceptions: !process.env.NODECUBE_DISABLE_EXCEPTION_LOG,
+ humanReadableUnhandledException: !!process.env.NODECUBE_ENABLE_READABLE_EXCEPTION_LOG,
+};
 
 const logger = new winston.Logger({
  transports: [
- consoleConfig,
+ new winston.transports.Console(consoleConfig),
  ],
 });