From de6a51778177679f1d319fbe70d1c67d963f53e9 Mon Sep 17 00:00:00 2001 From: winprn Date: Tue, 29 Oct 2024 15:08:54 +0700 Subject: [PATCH] improv: pass whole configs to logger --- packages/logger/src/log.ts | 4 ++-- packages/network/src/node.ts | 2 +- packages/node/src/rpc/index.ts | 5 ++++- packages/object/src/wasm/compiler.ts | 2 +- 4 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/logger/src/log.ts b/packages/logger/src/log.ts index e05507f4..4d93a4a5 100644 --- a/packages/logger/src/log.ts +++ b/packages/logger/src/log.ts @@ -10,9 +10,9 @@ export class Logger { // biome-ignore lint/suspicious/noExplicitAny: Do this to allow any method to be called on the logger [key: string]: any; - constructor(context: string, level: loglevel.LogLevelDesc = "info") { + constructor(context: string, config?: LoggerOptions) { this.log = loglevel.getLogger(context); - this.log.setLevel(level); + this.log.setLevel(config?.level || "info"); prefix.reg(loglevel); prefix.apply(this.log, { template: "%n", diff --git a/packages/network/src/node.ts b/packages/network/src/node.ts index 3c3fb588..ac03e363 100644 --- a/packages/network/src/node.ts +++ b/packages/network/src/node.ts @@ -56,7 +56,7 @@ export class TopologyNetworkNode { constructor(config?: TopologyNetworkNodeConfig) { this._config = config; - log = new Logger("topology::network", config?.log_config?.level); + log = new Logger("topology::network", config?.log_config); } async start() { diff --git a/packages/node/src/rpc/index.ts b/packages/node/src/rpc/index.ts index 5043a9a1..30c58a19 100644 --- a/packages/node/src/rpc/index.ts +++ b/packages/node/src/rpc/index.ts @@ -14,7 +14,10 @@ import type { } from "../proto/rpc_pb.js"; export function init(node: TopologyNode) { - const log = new Logger("topology::rpc", "info"); + const log = new Logger( + "topology::rpc", + node.config?.network_config?.log_config, + ); function subscribeCro( call: ServerUnaryCall, diff --git a/packages/object/src/wasm/compiler.ts b/packages/object/src/wasm/compiler.ts index 1eaa1637..343fd4a2 100644 --- a/packages/object/src/wasm/compiler.ts +++ b/packages/object/src/wasm/compiler.ts @@ -7,7 +7,7 @@ import { Logger } from "@topology-foundation/logger"; import asc from "assemblyscript/asc"; export async function compileWasm(path: string) { - const log = new Logger("topology::wasm", "info"); + const log = new Logger("topology::wasm", { level: "info" }); log.info("Compiling", path); const { error, stderr } = await asc.main(