From 36d3cc6aa491c619c8cdff3a1d55d51149930308 Mon Sep 17 00:00:00 2001 From: Luiz Silva Date: Fri, 21 Feb 2025 17:58:21 -0300 Subject: [PATCH] . --- dist/logger.d.ts | 5 +++-- dist/logger.js | 9 ++++++++- dist/logger.js.map | 2 +- package.json | 2 +- src/logger.ts | 15 ++++++++++++--- 5 files changed, 25 insertions(+), 8 deletions(-) diff --git a/dist/logger.d.ts b/dist/logger.d.ts index f6b7539..b2ecfde 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -1,15 +1,16 @@ -type tipoAmb = { +type tipoOpSessao = { inquilino: string; usuario: string; }; type tipoLog = { detalhes?: unknown[]; __filename?: string; + local?: string; }; export declare const logger: ({ app, eProducao }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoAmb) => { +}) => ({ inquilino, usuario }: tipoOpSessao) => { info: (mensagem: string, op_tipoLog?: tipoLog) => Promise; warn: (mensagem: string, op_tipoLog?: tipoLog) => Promise; error: (mensagem: string, op_tipoLog?: tipoLog) => Promise; diff --git a/dist/logger.js b/dist/logger.js index 737c6ae..a02a837 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -5,17 +5,24 @@ var __importDefault = (this && this.__importDefault) || function (mod) { Object.defineProperty(exports, "__esModule", { value: true }); exports.logger = void 0; const cross_fetch_1 = __importDefault(require("cross-fetch")); +const variaveisComuns_1 = require("./variaveisComuns"); const LOKI_BASE_URL = "https://log.idz.one"; const LOKI_ENDPOINT = "/loki/api/v1/push"; const logger = ({ app, eProducao }) => ({ inquilino, usuario }) => { const f = (level) => async (mensagem, op_tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {}; + let { __filename, detalhes, local } = op_tipoLog || {}; if (!eProducao) { app = `DEV-${app}`; } if (__filename && typeof process != "undefined" && process.cwd()) { __filename = __filename.replace(process.cwd(), ""); } + if (local) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ local })}="${local}"`]; + } + if (__filename) { + detalhes = [`${(0, variaveisComuns_1.nomeVariavel)({ __filename })}="${__filename}"`]; + } const timestamp = `${Date.now()}000000`; const mainLog = detalhes?.length ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` diff --git a/dist/logger.js.map b/dist/logger.js.map index d26ce2c..36dc69c 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":";;;;;;AAAA,8DAAoC;AAEpC,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAclC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAW,EAAE,EAAE;IAClC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAE/C,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AA/CU,QAAA,MAAM,UA+ChB"} \ No newline at end of file +{"version":3,"file":"logger.js","sourceRoot":"","sources":["../src/logger.ts"],"names":[],"mappings":";;;;;;AAAA,8DAAoC;AACpC,uDAAgD;AAEhD,MAAM,aAAa,GAAG,qBAAqB,CAAA;AAC3C,MAAM,aAAa,GAAG,mBAAmB,CAAA;AAelC,MAAM,MAAM,GACjB,CAAC,EAAE,GAAG,EAAE,SAAS,EAAuC,EAAE,EAAE,CAC5D,CAAC,EAAE,SAAS,EAAE,OAAO,EAAgB,EAAE,EAAE;IACvC,MAAM,CAAC,GACL,CAAC,KAAgB,EAAE,EAAE,CAAC,KAAK,EAAE,QAAgB,EAAE,UAAoB,EAAE,EAAE;QACrE,IAAI,EAAE,UAAU,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,UAAU,IAAI,EAAE,CAAA;QAEtD,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,GAAG,GAAG,OAAO,GAAG,EAAE,CAAA;QACpB,CAAC;QAED,IAAI,UAAU,IAAI,OAAO,OAAO,IAAI,WAAW,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC;YACjE,UAAU,GAAG,UAAU,CAAC,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,EAAE,CAAC,CAAA;QACpD,CAAC;QACD,IAAI,KAAK,EAAE,CAAC;YACV,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,KAAK,EAAE,CAAC,KAAK,KAAK,GAAG,CAAC,CAAA;QACtD,CAAC;QAED,IAAI,UAAU,EAAE,CAAC;YACf,QAAQ,GAAG,CAAC,GAAG,IAAA,8BAAY,EAAC,EAAE,UAAU,EAAE,CAAC,KAAK,UAAU,GAAG,CAAC,CAAA;QAChE,CAAC;QAED,MAAM,SAAS,GAAG,GAAG,IAAI,CAAC,GAAG,EAAE,QAAQ,CAAA;QAEvC,MAAM,OAAO,GAAG,QAAQ,EAAE,MAAM;YAC9B,CAAC,CAAC,GAAG,QAAQ,MAAM,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE;YACrE,CAAC,CAAC,QAAQ,CAAA;QAEZ,MAAM,OAAO,GAAG;YACd,MAAM,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,OAAO,EAAE,KAAK,EAAE;YAC1C,MAAM,EAAE;gBACN;oBACE,SAAS;oBACT,OAAO,EAAE,sBAAsB;iBAChC;aACF;SACF,CAAA;QAED,MAAM,QAAQ,GAAG,MAAM,IAAA,qBAAU,EAAC,GAAG,aAAa,GAAG,aAAa,EAAE,EAAE;YACpE,MAAM,EAAE,MAAM;YACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE;YAC/C,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,CAAC;SAC7C,CAAC,CAAA;QAEF,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,QAAQ,QAAQ,CAAC,MAAM,KAAK,MAAM,QAAQ,CAAC,IAAI,EAAE,EAAE,CAAC,CAAA;QACtE,CAAC;IACH,CAAC,CAAA;IAEH,OAAO;QACL,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;QACf,KAAK,EAAE,CAAC,CAAC,OAAO,CAAC;KAClB,CAAA;AACH,CAAC,CAAA;AAtDU,QAAA,MAAM,UAsDhB"} \ No newline at end of file diff --git a/package.json b/package.json index aceb1d4..fd72c74 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.78.0", + "version": "0.79.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index 17c9818..4fb9d34 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -1,11 +1,12 @@ import crossFetch from "cross-fetch" +import { nomeVariavel } from "./variaveisComuns" const LOKI_BASE_URL = "https://log.idz.one" const LOKI_ENDPOINT = "/loki/api/v1/push" type tipoLevel = "info" | "warn" | "error" -type tipoAmb = { +type tipoOpSessao = { inquilino: string usuario: string } @@ -13,14 +14,15 @@ type tipoAmb = { type tipoLog = { detalhes?: unknown[] __filename?: string + local?: string } export const logger = ({ app, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoAmb) => { + ({ inquilino, usuario }: tipoOpSessao) => { const f = (level: tipoLevel) => async (mensagem: string, op_tipoLog?: tipoLog) => { - let { __filename, detalhes } = op_tipoLog || {} + let { __filename, detalhes, local } = op_tipoLog || {} if (!eProducao) { app = `DEV-${app}` @@ -29,6 +31,13 @@ export const logger = if (__filename && typeof process != "undefined" && process.cwd()) { __filename = __filename.replace(process.cwd(), "") } + if (local) { + detalhes = [`${nomeVariavel({ local })}="${local}"`] + } + + if (__filename) { + detalhes = [`${nomeVariavel({ __filename })}="${__filename}"`] + } const timestamp = `${Date.now()}000000`