diff --git a/dist/logger.d.ts b/dist/logger.d.ts index d775b95..ebb5a37 100644 --- a/dist/logger.d.ts +++ b/dist/logger.d.ts @@ -7,6 +7,9 @@ type tipoLevel = "info" | "warn" | "error"; type tipoOpSessao = { inquilino: string; usuario: string; + parametros?: { + [k: string]: string; + }; }; type tipoLog = { detalhes?: unknown[]; @@ -16,8 +19,11 @@ type tipoLog = { [k: string]: string; }; }; -export declare const logger: ({ app: app_e, eProducao }: { +export declare const logger: ({ app: app_e, eProducao, parametros: parametrosAmbiente, }: { app: string; eProducao: boolean; -}) => ({ inquilino, usuario }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; + parametros?: { + [k: string]: string; + }; +}) => ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => (level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog) => Promise<[objeto: object, erro?: string]>; export {}; diff --git a/dist/logger.js b/dist/logger.js index 4915c59..2bad1ed 100644 --- a/dist/logger.js +++ b/dist/logger.js @@ -28,8 +28,8 @@ const defineCwd = (novoCwd) => { cwd = novoCwd; }; exports.defineCwd = defineCwd; -const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async (level, mensagem, op_tipoLog) => { - let { __filename, detalhes, local, parametros } = op_tipoLog || {}; +const logger = ({ app: app_e, eProducao, parametros: parametrosAmbiente, }) => ({ inquilino, usuario, parametros: parametrosSessao }) => async (level, mensagem, op_tipoLog) => { + let { __filename, detalhes, local, parametros: parametrosLog, } = op_tipoLog || {}; const app = `${eProducao ? "" : "DEV-"}${app_e}`; if (cwd && __filename) { __filename = __filename.replace(cwd, ""); @@ -45,7 +45,15 @@ const logger = ({ app: app_e, eProducao }) => ({ inquilino, usuario }) => async ? `${mensagem} | ${detalhes.map((d) => JSON.stringify(d)).join(" ")}` : mensagem; const payload = { - stream: { app, inquilino, usuario, level, ...(parametros || {}) }, + stream: { + app, + inquilino, + usuario, + level, + ...(parametrosAmbiente || {}), + ...(parametrosSessao || {}), + ...(parametrosLog || {}), + }, values: [ [ timestamp, diff --git a/dist/logger.js.map b/dist/logger.js.map index b29c4d4..ce50256 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 1318205..f59f7c5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "p-comuns", - "version": "0.91.0", + "version": "0.92.0", "description": "", "main": "dist/index.js", "scripts": { diff --git a/src/logger.ts b/src/logger.ts index bac76ec..31e4850 100644 --- a/src/logger.ts +++ b/src/logger.ts @@ -31,6 +31,7 @@ type tipoLevel = "info" | "warn" | "error" type tipoOpSessao = { inquilino: string usuario: string + parametros?: { [k: string]: string } } type tipoLog = { @@ -41,14 +42,27 @@ type tipoLog = { } export const logger = - ({ app: app_e, eProducao }: { app: string; eProducao: boolean }) => - ({ inquilino, usuario }: tipoOpSessao) => + ({ + app: app_e, + eProducao, + parametros: parametrosAmbiente, + }: { + app: string + eProducao: boolean + parametros?: { [k: string]: string } + }) => + ({ inquilino, usuario, parametros: parametrosSessao }: tipoOpSessao) => async ( level: tipoLevel, mensagem: string, op_tipoLog?: tipoLog, ): Promise<[objeto: object, erro?: string]> => { - let { __filename, detalhes, local, parametros } = op_tipoLog || {} + let { + __filename, + detalhes, + local, + parametros: parametrosLog, + } = op_tipoLog || {} const app = `${eProducao ? "" : "DEV-"}${app_e}` @@ -71,7 +85,15 @@ export const logger = : mensagem const payload = { - stream: { app, inquilino, usuario, level, ...(parametros || {}) }, + stream: { + app, + inquilino, + usuario, + level, + ...(parametrosAmbiente || {}), + ...(parametrosSessao || {}), + ...(parametrosLog || {}), + }, values: [ [ timestamp,