fix(logging): honor silent console level
This commit is contained in:
@@ -8,6 +8,7 @@ import { resolveMainSessionKeyFromConfig } from "../config/sessions.js";
|
|||||||
import { resetAgentRunContextForTest } from "../infra/agent-events.js";
|
import { resetAgentRunContextForTest } from "../infra/agent-events.js";
|
||||||
import { drainSystemEvents, peekSystemEvents } from "../infra/system-events.js";
|
import { drainSystemEvents, peekSystemEvents } from "../infra/system-events.js";
|
||||||
import { rawDataToString } from "../infra/ws.js";
|
import { rawDataToString } from "../infra/ws.js";
|
||||||
|
import { resetLogger, setLoggerOverride } from "../logging.js";
|
||||||
import {
|
import {
|
||||||
GATEWAY_CLIENT_MODES,
|
GATEWAY_CLIENT_MODES,
|
||||||
GATEWAY_CLIENT_NAMES,
|
GATEWAY_CLIENT_NAMES,
|
||||||
@@ -348,6 +349,7 @@ let tempHome: string | undefined;
|
|||||||
|
|
||||||
export function installGatewayTestHooks() {
|
export function installGatewayTestHooks() {
|
||||||
beforeEach(async () => {
|
beforeEach(async () => {
|
||||||
|
setLoggerOverride({ level: "silent", consoleLevel: "silent" });
|
||||||
previousHome = process.env.HOME;
|
previousHome = process.env.HOME;
|
||||||
tempHome = await fs.mkdtemp(
|
tempHome = await fs.mkdtemp(
|
||||||
path.join(os.tmpdir(), "clawdbot-gateway-home-"),
|
path.join(os.tmpdir(), "clawdbot-gateway-home-"),
|
||||||
@@ -388,6 +390,7 @@ export function installGatewayTestHooks() {
|
|||||||
}, 60_000);
|
}, 60_000);
|
||||||
|
|
||||||
afterEach(async () => {
|
afterEach(async () => {
|
||||||
|
resetLogger();
|
||||||
process.env.HOME = previousHome;
|
process.env.HOME = previousHome;
|
||||||
if (tempHome) {
|
if (tempHome) {
|
||||||
await fs.rm(tempHome, {
|
await fs.rm(tempHome, {
|
||||||
|
|||||||
@@ -116,6 +116,7 @@ function levelToMinLevel(level: Level): number {
|
|||||||
export function isFileLogLevelEnabled(level: LogLevel): boolean {
|
export function isFileLogLevelEnabled(level: LogLevel): boolean {
|
||||||
const settings = cachedSettings ?? resolveSettings();
|
const settings = cachedSettings ?? resolveSettings();
|
||||||
if (!cachedSettings) cachedSettings = settings;
|
if (!cachedSettings) cachedSettings = settings;
|
||||||
|
if (settings.level === "silent") return false;
|
||||||
return levelToMinLevel(level) <= levelToMinLevel(settings.level);
|
return levelToMinLevel(level) <= levelToMinLevel(settings.level);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -389,6 +390,7 @@ type SubsystemLogger = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
function shouldLogToConsole(level: Level, settings: ConsoleSettings): boolean {
|
function shouldLogToConsole(level: Level, settings: ConsoleSettings): boolean {
|
||||||
|
if (settings.level === "silent") return false;
|
||||||
const current = levelToMinLevel(level);
|
const current = levelToMinLevel(level);
|
||||||
const min = levelToMinLevel(settings.level);
|
const min = levelToMinLevel(settings.level);
|
||||||
return current <= min;
|
return current <= min;
|
||||||
|
|||||||
Reference in New Issue
Block a user