pinomin logger

packages/api/package.json

@@ -49,8 +49,6 @@
     "ncp": "^2.0.0",
     "node-cron": "^2.0.3",
     "on-finished": "^2.4.1",
-    "pino": "^8.8.0",
-    "pino-multi-stream": "^6.0.0",
     "portfinder": "^1.0.28",
     "simple-encryptor": "^4.0.0",
     "ssh2": "^1.11.0",

packages/api/src/index.js

@@ -1,7 +1,5 @@
-const { setLogger, getLogger, setLoggerName } = require('dbgate-tools');
+const { setLogger, getLogger, setLoggerName, createPinoLikeLogger } = require('dbgate-tools');
 const processArgs = require('./utility/processArgs');
-const pino = require('pino');
-const pinoms = require('pino-multi-stream');
 const fs = require('fs');
 const moment = require('moment');
 const path = require('path');
@@ -32,23 +30,40 @@ function configureLogger() {
   setLogsFilePath(logsFilePath);
   setLoggerName('main');
 
-  const streams = [];
-  if (!platformInfo.isElectron) {
-    streams.push({
-      stream: process.stdout,
-      level: process.env.CONSOLE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
-    });
-  }
-
-  streams.push({
-    stream: fs.createWriteStream(logsFilePath),
-    level: process.env.FILE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+  const logger = createPinoLikeLogger({
+    pid: process.pid,
+    targets: [
+      {
+        type: 'console',
+        // @ts-ignore
+        level: process.env.CONSOLE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+      },
+      {
+        type: 'stream',
+        // @ts-ignore
+        level: process.env.FILE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+        stream: fs.createWriteStream(logsFilePath, { flags: 'a' }),
+      },
+    ],
   });
 
-  let logger = pinoms({
-    redact: { paths: ['hostname'], remove: true },
-    streams,
-  });
+  // const streams = [];
+  // if (!platformInfo.isElectron) {
+  //   streams.push({
+  //     stream: process.stdout,
+  //     level: process.env.CONSOLE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+  //   });
+  // }
+
+  // streams.push({
+  //   stream: fs.createWriteStream(logsFilePath),
+  //   level: process.env.FILE_LOG_LEVEL || process.env.LOG_LEVEL || 'info',
+  // });
+
+  // let logger = pinoms({
+  //   redact: { paths: ['hostname'], remove: true },
+  //   streams,
+  // });
 
   // // @ts-ignore
   // let logger = pino({

packages/tools/package.json

@@ -36,7 +36,6 @@
     "debug": "^4.3.4",
     "json-stable-stringify": "^1.0.1",
     "lodash": "^4.17.21",
-    "pino": "^8.8.0",
     "uuid": "^3.4.0"
   }
 }

packages/tools/src/getLogger.ts

@@ -1,14 +1,20 @@
-import pino, { Logger } from 'pino';
+import { createPinoLikeLogger, ILogger } from './pinomin';
 
-let _logger: Logger;
+let _logger: ILogger;
 let _name: string = null;
-const defaultLogger: Logger = pino({ redact: { paths: ['hostname'], remove: true } });
+const defaultLogger: ILogger = createPinoLikeLogger({
+  pid: global?.process?.pid,
+  targets: [{ type: 'console', level: 'info' }],
+});
 
-export function setLogger(value: Logger) {
+export function setLogger(value: ILogger) {
   _logger = value;
 }
+export function setLoggerName(value) {
+  _name = value;
+}
 
-export function getLogger(caller?: string): Logger {
+export function getLogger(caller?: string): ILogger {
   let res = _logger || defaultLogger;
   if (caller) {
     const props = { caller };
@@ -19,7 +25,3 @@ export function getLogger(caller?: string): Logger {
   }
   return res;
 }
-
-export function setLoggerName(value) {
-  _name = value;
-}

packages/tools/src/index.ts

@@ -19,3 +19,4 @@ export * from './computeDiffRows';
 export * from './preloadedRowsTools';
 export * from './ScriptWriter';
 export * from './getLogger';
+export * from './pinomin';