From 5fb26367ed53cd926a929800da87134607207340 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Wed, 23 Sep 2026 11:03:33 -0700 Subject: [PATCH] reorder docker case --- server/src/domain/docker/docker-alert.ts | 2 +- server/src/domain/incidents/incident.service.ts | 8 ++++---- server/src/service/network/DockerProvider.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/server/src/domain/docker/docker-alert.ts b/server/src/domain/docker/docker-alert.ts index 45b8075ba..6045625a7 100644 --- a/server/src/domain/docker/docker-alert.ts +++ b/server/src/domain/docker/docker-alert.ts @@ -43,5 +43,5 @@ export const describeContainerBreach = (breach: DockerContainerBreach): string = if (breach.exitCode === undefined) { return `${breach.name}: stopped`; } - return `${breach.name} stopped (exit code ${breach.exitCode})`; + return `${breach.name}: stopped (exit code ${breach.exitCode})`; }; diff --git a/server/src/domain/incidents/incident.service.ts b/server/src/domain/incidents/incident.service.ts index 138a3fcac..1c249626a 100644 --- a/server/src/domain/incidents/incident.service.ts +++ b/server/src/domain/incidents/incident.service.ts @@ -107,16 +107,16 @@ export class IncidentService implements IIncidentService { }; private buildThresholdBreachMessage(monitor: Monitor, monitorStatusResponse?: MonitorStatusResponse): string { - if (!monitorStatusResponse) { - return "Threshold breach detected"; - } - if (monitor.type === "docker") { const containers = (monitorStatusResponse?.payload as DockerStatusPayload | undefined)?.containers ?? []; const breaches = findContainerBreaches(monitor, containers); return breaches.length > 0 ? breaches.map(describeContainerBreach).join(", ") : "Container alert"; } + if (!monitorStatusResponse) { + return "Threshold breach detected"; + } + const breaches = this.notificationMessageBuilder.extractThresholdBreaches(monitor, monitorStatusResponse); if (breaches.length === 0) { diff --git a/server/src/service/network/DockerProvider.ts b/server/src/service/network/DockerProvider.ts index fa5f3c9e5..238bccede 100644 --- a/server/src/service/network/DockerProvider.ts +++ b/server/src/service/network/DockerProvider.ts @@ -286,7 +286,7 @@ export class DockerProvider implements IStatusProvider { info.health = this.toHealthStatus(inspectResult.value.State?.Health?.Status); info.ports = this.toPorts(inspectResult.value.NetworkSettings?.Ports); info.mounts = this.toMounts(inspectResult.value.Mounts); - info.exitCode = inspectResult.value.State.ExitCode; + info.exitCode = inspectResult.value.State?.ExitCode; } else { info.exitCode = this.exitCodeFromStatus(summary.Status); info.health = this.healthFromStatus(summary.Status);