mirror of
https://github.com/openclaw/openclaw.git
synced 2026-05-09 01:38:26 +00:00
refactor(agents): migrate console.warn/error/info to subsystem logger (#22906)
Merged via /review-pr -> /prepare-pr -> /merge-pr.
Prepared head SHA: a806c4cb27
Co-authored-by: Kepler2024 <166882517+Kepler2024@users.noreply.github.com>
Co-authored-by: gumadeiras <5599352+gumadeiras@users.noreply.github.com>
Reviewed-by: @gumadeiras
This commit is contained in:
@@ -1,10 +1,13 @@
|
||||
import type { OpenClawConfig } from "../../config/config.js";
|
||||
import { isDangerousHostEnvVarName } from "../../infra/host-env-security.js";
|
||||
import { createSubsystemLogger } from "../../logging/subsystem.js";
|
||||
import { sanitizeEnvVars, validateEnvVarValue } from "../sandbox/sanitize-env-vars.js";
|
||||
import { resolveSkillConfig } from "./config.js";
|
||||
import { resolveSkillKey } from "./frontmatter.js";
|
||||
import type { SkillEntry, SkillSnapshot } from "./types.js";
|
||||
|
||||
const log = createSubsystemLogger("env-overrides");
|
||||
|
||||
type EnvUpdate = { key: string; prev: string | undefined };
|
||||
type SkillConfig = NonNullable<ReturnType<typeof resolveSkillConfig>>;
|
||||
|
||||
@@ -114,13 +117,10 @@ function applySkillConfigEnvOverrides(params: {
|
||||
});
|
||||
|
||||
if (sanitized.blocked.length > 0) {
|
||||
console.warn(
|
||||
`[Security] Blocked skill env overrides for ${skillKey}:`,
|
||||
sanitized.blocked.join(", "),
|
||||
);
|
||||
log.warn(`Blocked skill env overrides for ${skillKey}: ${sanitized.blocked.join(", ")}`);
|
||||
}
|
||||
if (sanitized.warnings.length > 0) {
|
||||
console.warn(`[Security] Suspicious skill env overrides for ${skillKey}:`, sanitized.warnings);
|
||||
log.warn(`Suspicious skill env overrides for ${skillKey}: ${sanitized.warnings.join(", ")}`);
|
||||
}
|
||||
|
||||
for (const [envKey, envValue] of Object.entries(sanitized.allowed)) {
|
||||
|
||||
@@ -640,14 +640,12 @@ export async function syncSkillsToWorkspace(params: {
|
||||
});
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : JSON.stringify(error);
|
||||
console.warn(
|
||||
`[skills] Failed to resolve safe destination for ${entry.skill.name}: ${message}`,
|
||||
);
|
||||
skillsLogger.warn(`Failed to resolve safe destination for ${entry.skill.name}: ${message}`);
|
||||
continue;
|
||||
}
|
||||
if (!dest) {
|
||||
console.warn(
|
||||
`[skills] Failed to resolve safe destination for ${entry.skill.name}: invalid source directory name`,
|
||||
skillsLogger.warn(
|
||||
`Failed to resolve safe destination for ${entry.skill.name}: invalid source directory name`,
|
||||
);
|
||||
continue;
|
||||
}
|
||||
@@ -658,7 +656,7 @@ export async function syncSkillsToWorkspace(params: {
|
||||
});
|
||||
} catch (error) {
|
||||
const message = error instanceof Error ? error.message : JSON.stringify(error);
|
||||
console.warn(`[skills] Failed to copy ${entry.skill.name} to sandbox: ${message}`);
|
||||
skillsLogger.warn(`Failed to copy ${entry.skill.name} to sandbox: ${message}`);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user