Skip to content

Commit 60112d8

Browse files
committed
fix(logs): require complete no-error values in colon pairs
1 parent c9817da commit 60112d8

2 files changed

Lines changed: 18 additions & 3 deletions

File tree

‎apps/dokploy/__test__/logs/log-classification.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,17 @@ test("does not classify explicit non-error key/values as error (#4538)", () => {
2323
expect(getLogType("request done, error: null").type).not.toBe("error");
2424
expect(getLogType("checks passed, failures=0").type).not.toBe("error");
2525
expect(getLogType('shutdown clean, error=""').type).not.toBe("error");
26+
expect(getLogType('job done failed=false error=""').type).not.toBe("error");
27+
});
28+
29+
test("keeps errors whose value merely starts with a no-error word", () => {
30+
expect(getLogType("connect failed: no route to host").type).toBe("error");
31+
expect(getLogType("connection failed: no such host").type).toBe("error");
32+
expect(getLogType("error: none of the configured nodes are available").type).toBe(
33+
"error",
34+
);
35+
expect(getLogType("error: nil pointer dereference").type).toBe("error");
36+
expect(getLogType("request failed: 0 bytes received").type).toBe("error");
2637
});
2738

2839
test("keeps statusCode-based classification", () => {

‎apps/dokploy/components/dashboard/docker/logs/utils.ts‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -99,9 +99,13 @@ export const getLogType = (message: string): LogStyle => {
9999

100100
// Key/value pairs that explicitly report a non-error (e.g. "error: none",
101101
// "failed: false") must not trigger the error keyword patterns below
102-
const nonErrorKeyValues =
103-
/\b(?:error|err|errors|failed|failure|failures)s?\s*[:=]\s*(?:none|null|nil|false|0|no|-|""|'')(?=[\s,;.)\]]|$)/gi;
104-
const errorScope = lowerMessage.replace(nonErrorKeyValues, "");
102+
const nonErrorColonPairs =
103+
/\b(?:error|err|errors|failed|failure|failures)\s*:\s*(?:none|null|nil|false|0|no|-|""|'')(?=[,;.)\]]|$)/gi;
104+
const nonErrorLogfmtPairs =
105+
/\b(?:error|err|errors|failed|failure|failures)\s*=\s*(?:none|null|nil|false|0|no|-|""|'')(?=[\s,;.)\]]|$)/gi;
106+
const errorScope = lowerMessage
107+
.replace(nonErrorColonPairs, "")
108+
.replace(nonErrorLogfmtPairs, "");
105109

106110
if (
107111
/(?:^|\s)(?:error|err):?\s/i.test(errorScope) ||

0 commit comments

Comments
 (0)