fix: app lifecycle shutdown
This commit is contained in:
parent
e459606436
commit
7d61e7d465
4 changed files with 16 additions and 18 deletions
|
|
@ -1,8 +1,8 @@
|
|||
import { afterEach, describe, expect, mock, spyOn, test } from "bun:test";
|
||||
import { Scheduler } from "../../../core/scheduler";
|
||||
import * as agentsManagerModule from "../../agents/agents-manager";
|
||||
import * as backendModule from "../../backends/backend";
|
||||
import type { VolumeBackend } from "../../backends/backend";
|
||||
import * as bootstrapModule from "../bootstrap";
|
||||
import { createTestVolume } from "~/test/helpers/volume";
|
||||
|
||||
const loadShutdownModule = async () => {
|
||||
|
|
@ -21,7 +21,7 @@ describe("shutdown", () => {
|
|||
const stopScheduler = mock(async () => {
|
||||
events.push("scheduler.stop");
|
||||
});
|
||||
const stopAgentRuntime = mock(async () => {
|
||||
const stopApplicationRuntime = mock(async () => {
|
||||
events.push("agents.stop");
|
||||
});
|
||||
const unmountVolume = mock(async () => {
|
||||
|
|
@ -39,7 +39,7 @@ describe("shutdown", () => {
|
|||
});
|
||||
|
||||
spyOn(Scheduler, "stop").mockImplementation(stopScheduler);
|
||||
spyOn(agentsManagerModule, "stopAgentRuntime").mockImplementation(stopAgentRuntime);
|
||||
spyOn(bootstrapModule, "stopApplicationRuntime").mockImplementation(stopApplicationRuntime);
|
||||
spyOn(backendModule, "createVolumeBackend").mockImplementation(
|
||||
() =>
|
||||
({
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
import { runDbMigrations } from "../../db/db";
|
||||
import { agentManager, spawnLocalAgent } from "../agents/agents-manager";
|
||||
import { agentManager, spawnLocalAgent, stopAgentRuntime } from "../agents/agents-manager";
|
||||
import { runMigrations } from "./migrations";
|
||||
import { startup } from "./startup";
|
||||
|
||||
|
|
@ -25,3 +25,11 @@ export const bootstrapApplication = async () => {
|
|||
throw err;
|
||||
}
|
||||
};
|
||||
|
||||
export const stopApplicationRuntime = async () => {
|
||||
try {
|
||||
await stopAgentRuntime();
|
||||
} finally {
|
||||
bootstrapPromise = undefined;
|
||||
}
|
||||
};
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@ import { Scheduler } from "../../core/scheduler";
|
|||
import { db } from "../../db/db";
|
||||
import { logger } from "@zerobyte/core/node";
|
||||
import { createVolumeBackend } from "../backends/backend";
|
||||
import { stopAgentRuntime } from "../agents/agents-manager";
|
||||
import { stopApplicationRuntime } from "./bootstrap";
|
||||
|
||||
export const shutdown = async () => {
|
||||
await Scheduler.stop();
|
||||
await stopAgentRuntime();
|
||||
await stopApplicationRuntime();
|
||||
|
||||
const volumes = await db.query.volumesTable.findMany({
|
||||
where: { status: "mounted" },
|
||||
|
|
|
|||
|
|
@ -1,20 +1,10 @@
|
|||
import { definePlugin } from "nitro";
|
||||
import { bootstrapApplication } from "../modules/lifecycle/bootstrap";
|
||||
import { bootstrapApplication, stopApplicationRuntime } from "../modules/lifecycle/bootstrap";
|
||||
import { logger } from "@zerobyte/core/node";
|
||||
import { toMessage } from "../utils/errors";
|
||||
import { stopAgentRuntime } from "../modules/agents/agents-manager";
|
||||
|
||||
type ProcessWithAgentCloseHook = NodeJS.Process & {
|
||||
__zerobyteAgentRuntimeCloseHookRegistered?: boolean;
|
||||
};
|
||||
|
||||
export default definePlugin(async (nitroApp) => {
|
||||
const runtimeProcess = process as ProcessWithAgentCloseHook;
|
||||
|
||||
if (!runtimeProcess.__zerobyteAgentRuntimeCloseHookRegistered) {
|
||||
nitroApp.hooks.hook("close", stopAgentRuntime);
|
||||
runtimeProcess.__zerobyteAgentRuntimeCloseHookRegistered = true;
|
||||
}
|
||||
nitroApp.hooks.hook("close", stopApplicationRuntime);
|
||||
|
||||
await bootstrapApplication().catch((err) => {
|
||||
logger.error(`Bootstrap failed: ${toMessage(err)}`);
|
||||
|
|
|
|||
Loading…
Reference in a new issue