From 67f215ef82ccbe7225695b8f05f45947cc6f3594 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Mon, 24 Feb 2025 14:57:24 -0300 Subject: [PATCH] melhorias de log --- dist/logger.d.ts | 2 +- dist/logger.js | 6 ++-- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 69 +++++++++++++++++++++++----------------------- 5 files changed, 39 insertions(+), 42 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index 34939c0..f7fb927 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -13,7 +13,7 @@ type tipoLog = { __filename?: string; local?: string; }; -export declare const logger: ({ app, eProducao }: { +export declare const logger: ({ app: app_e, eProducao }: { app: string; eProducao: boolean; }) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; diff --git a/dist/logger.js b/dist/logger.js index 75fe8d8..4afe9a7 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -28,11 +28,9 @@ const defineCwd = (novoCwd) => { cwd = novoCwd; }; exports.defineCwd = defineCwd; -const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { +const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { let { __filename, detalhes, local } = op_tipoLog || {}; - if (!eProducao) { - app = `DEV-${app}`; - } + const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { __filename = __filename.replace(cwd, ""); } diff --git a/dist/logger.js.map b/dist/logger.js.map index b85c8a2..bca7aa9 100644 --- a/dist/logger.js.map +++ b/dist/logger.js.map @@ -1 +1 @@ -{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package.json b/package.json index b21c557..f7e4aae 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.89.0", + "version": "0.90.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 01d7672..302e2f3 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -41,48 +41,47 @@ type tipoLog = { export const logger = ({ app: app_e, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => - async ( - level: tipoLevel, - mensagem: string, - op_tipoLog?: tipoLog, - ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local } = op_tipoLog || {} + ({ inquilino, usuario }: tipoOpSessao) => + async ( + level: tipoLevel, + mensagem: string, + op_tipoLog?: tipoLog, + ): Promise<[objeto: object, erro?: string]> => { + let { __filename, detalhes, local } = op_tipoLog || {} - const app = `${eProducao ? '' : 'DEV-'}${app_e}` + const app = `${eProducao ? "" : "DEV-"}${app_e}` + if (cwd && __filename) { + __filename = __filename.replace(cwd, "") + } - if (cwd && __filename) { - __filename = __filename.replace(cwd, "") - } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } - if (local) { - detalhes = [`${nomeVariavel({ local })}="${local}"`] - } + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } - if (__filename) { - detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] - } + const timestamp = `${Date.now()}000000` - const timestamp = `${Date.now()}000000` + const mainLog = detalhes?.length + ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` + : mensagem - const mainLog = detalhes?.length - ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` - : mensagem + const payload = { + stream: { app, inquilino, usuario, level }, + values: [ + [ + timestamp, + mainLog, // Linha de log direta + ], + ], + } - const payload = { - stream: { app, inquilino, usuario, level }, - values: [ - [ - timestamp, - mainLog, // Linha de log direta - ], - ], - } + const objeto = { streams: [payload] } - const objeto = { streams: [payload] } + const response = await postLogger({ objeto }) - const response = await postLogger({ objeto }) - - return response - } + return response + }