diff --git a/sdk/lib/emverLite/mod.ts b/sdk/lib/emverLite/mod.ts index dd68360ac..f69d4f35d 100644 --- a/sdk/lib/emverLite/mod.ts +++ b/sdk/lib/emverLite/mod.ts @@ -179,7 +179,6 @@ export class Checker { * @returns */ static parse(range: string | Checker): Checker { - console.log(`Parser (${range})`) if (range instanceof Checker) { return range } diff --git a/sdk/lib/health/HealthCheck.ts b/sdk/lib/health/HealthCheck.ts index 488ecdcf5..e1fbee97b 100644 --- a/sdk/lib/health/HealthCheck.ts +++ b/sdk/lib/health/HealthCheck.ts @@ -40,19 +40,21 @@ export function healthCheck(o: { const { status, message } = await o.fn(overlay) await o.effects.setHealth({ name: o.name, - status, - message, + id: o.name, + result: status, + message: message || "", }) currentValue.hadSuccess = true - currentValue.lastResult = "passing" + currentValue.lastResult = "success" await triggerFirstSuccess().catch((err) => { console.error(err) }) } catch (e) { await o.effects.setHealth({ name: o.name, - status: "failure", - message: asMessage(e), + id: o.name, + result: "failure", + message: asMessage(e) || "", }) currentValue.lastResult = "failure" } diff --git a/sdk/lib/health/checkFns/checkPortListening.ts b/sdk/lib/health/checkFns/checkPortListening.ts index 89dcf89b3..4cc0738da 100644 --- a/sdk/lib/health/checkFns/checkPortListening.ts +++ b/sdk/lib/health/checkFns/checkPortListening.ts @@ -45,7 +45,7 @@ export async function checkPortListening( port, ) if (hasAddress) { - return { status: "passing", message: options.successMessage } + return { status: "success", message: options.successMessage } } return { status: "failure", diff --git a/sdk/lib/health/checkFns/checkWebUrl.ts b/sdk/lib/health/checkFns/checkWebUrl.ts index d18509ee3..8f61ae2ef 100644 --- a/sdk/lib/health/checkFns/checkWebUrl.ts +++ b/sdk/lib/health/checkFns/checkWebUrl.ts @@ -22,7 +22,7 @@ export const checkWebUrl = async ( .then( (x) => ({ - status: "passing", + status: "success", message: successMessage, }) as const, ) diff --git a/sdk/lib/health/checkFns/runHealthScript.ts b/sdk/lib/health/checkFns/runHealthScript.ts index 5d69f5e17..f0f41ee91 100644 --- a/sdk/lib/health/checkFns/runHealthScript.ts +++ b/sdk/lib/health/checkFns/runHealthScript.ts @@ -32,7 +32,7 @@ export const runHealthScript = async ( throw { status: "failure", message: errorMessage } as CheckResult }) return { - status: "passing", + status: "success", message: message(res.stdout.toString()), } as CheckResult } diff --git a/sdk/lib/mainFn/Daemons.ts b/sdk/lib/mainFn/Daemons.ts index 540ca3d37..640ab8c4b 100644 --- a/sdk/lib/mainFn/Daemons.ts +++ b/sdk/lib/mainFn/Daemons.ts @@ -227,7 +227,7 @@ export class Daemons { }) as CheckResult, ) currentInput.lastResult = response.status || null - if (!currentInput.hadSuccess && response.status === "passing") { + if (!currentInput.hadSuccess && response.status === "success") { currentInput.hadSuccess = true resolve(child) } diff --git a/sdk/lib/trigger/changeOnFirstSuccess.ts b/sdk/lib/trigger/changeOnFirstSuccess.ts index 28129e3e5..4c45afe31 100644 --- a/sdk/lib/trigger/changeOnFirstSuccess.ts +++ b/sdk/lib/trigger/changeOnFirstSuccess.ts @@ -11,7 +11,7 @@ export function changeOnFirstSuccess(o: { beforeFirstSuccess.next() for ( let res = await beforeFirstSuccess.next(); - currentValue?.lastResult !== "passing" && !res.done; + currentValue?.lastResult !== "success" && !res.done; res = await beforeFirstSuccess.next() ) { yield diff --git a/sdk/lib/trigger/successFailure.ts b/sdk/lib/trigger/successFailure.ts index 1886402c4..1bab27289 100644 --- a/sdk/lib/trigger/successFailure.ts +++ b/sdk/lib/trigger/successFailure.ts @@ -12,7 +12,7 @@ export function successFailure(o: { beforeSuccess.next() for ( let res = await beforeSuccess.next(); - currentValue?.lastResult !== "passing" && !res.done; + currentValue?.lastResult !== "success" && !res.done; res = await beforeSuccess.next() ) { yield @@ -21,7 +21,7 @@ export function successFailure(o: { const duringError = o.duringError(getInput) for ( let res = await duringError.next(); - currentValue?.lastResult === "passing" && !res.done; + currentValue?.lastResult === "success" && !res.done; res = await duringError.next() ) { yield diff --git a/sdk/lib/types.ts b/sdk/lib/types.ts index daa7ffe43..3ddf79a36 100644 --- a/sdk/lib/types.ts +++ b/sdk/lib/types.ts @@ -143,13 +143,7 @@ export type Daemon = { [DaemonProof]: never } -export type HealthStatus = - | `passing` - | `disabled` - | `starting` - | `warning` - | `failure` - +export type HealthStatus = HealthCheckResult["result"] export type SmtpValue = { server: string port: number