finalize logger migration

package.json

@@ -5,7 +5,7 @@
   "license": "MIT",
   "scripts": {
     "prestart": "rimraf dist && tsc -p tsconfig.json && cpy src/config.json dist ",
-    "start": "node ./dist/index.js | node ./dist/logger/transport.js",
+    "start": "node ./dist | node ./dist/transport",
     "test": "jest --maxWorkers=1 --coverage && cat ./coverage/lcov.info | coveralls",
     "testfast": "jest",
     "coverage": "jest --coverage",
@@ -72,6 +72,7 @@
     "collectCoverageFrom": [
       "**/*.{ts,tsx}",
       "!src/index.ts",
+      "!src/transport/index.ts",
       "!**/__tests__/**",
       "!**/node_modules/**",
       "!**/vendor/**",

src/__tests__/logger/LineIntegration.test.ts → src/__tests__/transport/LineIntegration.test.ts

@@ -1,4 +1,4 @@
-import LineIntegration from '../../logger/LineIntegration';
+import LineIntegration from '../../transport/LineIntegration';
 import { LineConfig } from '../../types';
 import * as nock from 'nock';
 import { delay } from '../../util';

src/__tests__/logger/SlackIntegration.test.ts → src/__tests__/transport/SlackIntegration.test.ts

@@ -1,4 +1,4 @@
-import SlackIntegration from '../../logger/SlackIntegration';
+import SlackIntegration from '../../transport/SlackIntegration';
 import { SlackConfig } from '../../types';
 import * as nock from 'nock';
 

src/__tests__/transport/pretty.mock.test.ts

@@ -0,0 +1,29 @@
+jest.mock('date-fns', () => ({
+  format: jest
+    .fn()
+    .mockImplementationOnce(() => {
+      throw new Error();
+    })
+    .mockImplementationOnce(() => {
+      throw new Error('test');
+    })
+}));
+
+import pretty from '../../transport/pretty';
+import { Readable } from 'stream';
+
+test('pretty split callback throws', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: true });
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 40, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);
+});
+
+test('pretty split callback throws 2', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: true });
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 40, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);
+});

src/__tests__/transport/pretty.test.ts

@@ -0,0 +1,58 @@
+import pretty from '../../transport/pretty';
+import { Readable } from 'stream';
+
+test('pretty', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: true });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 40, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty no label', () => {
+  const result = pretty({ colorize: true, withLabel: false, debug: true });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 40, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty debug', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: true });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 20, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty no debug', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: false });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 20, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty no label/debug', () => {
+  const result = pretty({ colorize: true, withLabel: false, debug: false });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 20, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty no color/label/debug', () => {
+  const result = pretty({ colorize: false, withLabel: false, debug: false });  
+  const stream = new Readable();
+  stream.push('{ "msg": "Test message", "time": 1514074545477, "level": 20, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});
+
+test('pretty invalid json', () => {
+  const result = pretty({ colorize: true, withLabel: true, debug: true });  
+  const stream = new Readable();
+  stream.push('{ "msg": Test message", "time": 1514074545477, "level": 40, "label": "TestStream" }');
+  stream.push(null);
+  stream.pipe(result).pipe(process.stdout);  
+});

src/logger/index.ts

@@ -2,21 +2,34 @@ import * as _ from 'lodash';
 import * as pino from 'pino';
 import * as util from 'util';
 
+export const options = { enabled: true };
+
 const logger = pino({ level: 'debug' });
 const cache = new Map();
+const noop = () => {
+  return;
+};
 
 export function getLogger(name: string) {
+  if (!options.enabled) {
+    return {
+      debug: noop,
+      info: noop,
+      warn: noop,
+      error: noop
+    };
+  }
   const label = _.trimEnd(name, 'Impl');
   if (cache.has(label)) {
     return cache.get(label);
   }
   const childLogger = logger.child({ label });
-  const normalized = {
+  const wrappedLogger = {
     debug: (s: string, ...args) => childLogger.debug(util.format(s, ...args)),
     info: (s: string, ...args) => childLogger.info(util.format(s, ...args)),
     warn: (s: string, ...args) => childLogger.warn(util.format(s, ...args)),
     error: (s: string, ...args) => childLogger.error(util.format(s, ...args))
   };
-  cache.set(label, normalized);
-  return normalized;
+  cache.set(label, wrappedLogger);
+  return wrappedLogger;
 }