@autofleet/logger 1.0.7 → 1.1.0-beta1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/index.js +16 -10
  2. package/index.test.js +2 -2
  3. package/package.json +2 -3
package/index.js CHANGED
@@ -1,5 +1,4 @@
1
1
  const winston = require('winston');
2
- const snakeCaseKeys = require('snakecase-keys')
3
2
  const Events = require('@autofleet/events');
4
3
 
5
4
  const { createLogger } = winston;
@@ -7,6 +6,8 @@ require('dotenv').config();
7
6
 
8
7
  const { env } = process;
9
8
 
9
+ const isProd = env.NODE_ENV === 'production';
10
+
10
11
  const infoEnvNmaes = [
11
12
  'production',
12
13
  'staging',
@@ -27,6 +28,10 @@ const getLevel = (logLevel) => {
27
28
  };
28
29
 
29
30
  const enumerateErrorFormat = winston.format((info) => {
31
+ // fix for this crap: https://github.com/googleapis/nodejs-logging-winston/issues/285
32
+ // eslint-disable-next-line no-param-reassign
33
+ info.severity = info.level.toUpperCase();
34
+
30
35
  if (info.message instanceof Error) {
31
36
  info.message = Object.assign({ // eslint-disable-line
32
37
  message: info.message.message,
@@ -52,7 +57,7 @@ const enumerateErrorFormat = winston.format((info) => {
52
57
  });
53
58
 
54
59
  const getFormat = () => {
55
- if (env.NODE_ENV === 'production') {
60
+ if (isProd) {
56
61
  return winston.format.combine(
57
62
  enumerateErrorFormat(),
58
63
  winston.format.json(),
@@ -73,23 +78,24 @@ const clientFacingLogLevel = [
73
78
  'info',
74
79
  ];
75
80
 
76
- const createClientFacingLog = (logger, level, events) => async (message, entities, payload) => {
77
- logger[level](message, {...payload, entities});
78
- events.send('log_events', '1', {
81
+
82
+ const createClientFacingLog = (logger, level, events) => async (msg, entities, payload) => {
83
+ logger[level](msg, payload);
84
+ events.send('log_events', 1, {
85
+ action: 'logEvent',
79
86
  level,
80
- message,
81
- ...snakeCaseKeys(entities),
87
+ ...entities,
82
88
  payload: JSON.stringify(payload),
83
89
  });
84
90
  };
85
91
 
86
92
  const createLoggerInstance = (level, exceptionHandlers) => {
87
- const transports = [new winston.transports.Console()];
88
-
89
93
  const logger = createLogger({
90
94
  level,
91
95
  format: getFormat(),
92
- transports,
96
+ transports: [
97
+ new winston.transports.Console(),
98
+ ],
93
99
  exceptionHandlers,
94
100
  exitOnError: false,
95
101
  });
package/index.test.js CHANGED
@@ -68,9 +68,9 @@ describe('Logger', () => {
68
68
  action: 'logEvent',
69
69
  businessModelId: 'uuid',
70
70
  level: 'info',
71
- payload: {
71
+ payload: JSON.stringify({
72
72
  attr1: 'Value',
73
- },
73
+ }),
74
74
  },
75
75
  ],
76
76
  ]);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@autofleet/logger",
3
- "version": "1.0.7",
3
+ "version": "1.1.0-beta1",
4
4
  "description": "",
5
5
  "scripts": {
6
6
  "coverage": "jest --coverage --forceExit --runInBand",
@@ -23,12 +23,11 @@
23
23
  },
24
24
  "homepage": "https://github.com/Autofleet/logger",
25
25
  "dependencies": {
26
- "@autofleet/events": "^1.1.14",
26
+ "@autofleet/events": "^1.2.8-beta1",
27
27
  "@google-cloud/logging-winston": "^0.10.2",
28
28
  "@google-cloud/pubsub": "^0.20.1",
29
29
  "dotenv": "^5.0.1",
30
30
  "jest": "^22.4.4",
31
- "snakecase-keys": "^3.2.1",
32
31
  "winston": "^3.0.0"
33
32
  },
34
33
  "devDependencies": {