Merge branch 'integration/new-container-runtime' of github.com:Start9Labs/start-os into integration/new-container-runtime

This commit is contained in:
J H
2024-03-28 13:37:21 -06:00
102 changed files with 442 additions and 131 deletions

View File

@@ -112,25 +112,29 @@ export class MainLoop {
])
if (executed.exitCode === 59) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "disabled",
message:
executed.stderr.toString() || executed.stdout.toString(),
})
return
}
if (executed.exitCode === 60) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "starting",
message:
executed.stderr.toString() || executed.stdout.toString(),
})
return
}
if (executed.exitCode === 61) {
await effects.setHealth({
name: healthId,
id: healthId,
result: "failure",
name: value.name,
result: "loading",
message:
executed.stderr.toString() || executed.stdout.toString(),
})
@@ -140,16 +144,16 @@ export class MainLoop {
const message = executed.stdout.toString()
if (!!errorMessage) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "failure",
message: errorMessage || "",
message: errorMessage,
})
return
}
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "success",
message,
})
@@ -160,10 +164,10 @@ export class MainLoop {
const method = moduleCode.health?.[healthId]
if (!method) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "failure",
message: `Expecting that thejs health check ${healthId} exists`,
message: `Expecting that the js health check ${healthId} exists`,
})
return
}
@@ -175,17 +179,17 @@ export class MainLoop {
if ("result" in result) {
await effects.setHealth({
message: "",
name: healthId,
id: healthId,
name: value.name,
result: "success",
message: null,
})
return
}
if ("error" in result) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "failure",
message: result.error,
})
@@ -193,8 +197,8 @@ export class MainLoop {
}
if (!("error-code" in result)) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "failure",
message: `Unknown error type ${JSON.stringify(result)}`,
})
@@ -203,33 +207,35 @@ export class MainLoop {
const [code, message] = result["error-code"]
if (code === 59) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "disabled",
message,
})
return
}
if (code === 60) {
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "starting",
message,
})
return
}
if (code === 61) {
await effects.setHealth({
name: healthId,
id: healthId,
result: "failure",
name: value.name,
result: "loading",
message,
})
return
}
await effects.setHealth({
name: healthId,
id: healthId,
name: value.name,
result: "failure",
message: `${result["error-code"][0]}: ${result["error-code"][1]}`,
})