Skip to content

fix(cli): bound managed service shutdown #43461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
thdxr wants to merge 1 commit into
base: v2
Choose a base branch
from
+11 −1
Open

fix(cli): bound managed service shutdown #43461

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion packages/cli/src/server-process.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,11 +41,21 @@ export const run = Effect.fnUntraced(function* (options: Options) {

const processEffect = Effect.fnUntraced(function* (options: Options) {
const global = yield* Global.Service
const shutdownWatchdogs = new Set<ReturnType<typeof setTimeout>>()
if (options.mode === "service") yield* Effect.sync(() => process.chdir(global.home))
return yield* Effect.scoped(
Effect.gen(function* () {
const foreground = options.mode === "default"
const serviceOptions = options.mode === "service" ? yield* ServiceConfig.options() : undefined
// A native timer can still fire when an Effect finalizer never completes.
if (serviceOptions !== undefined)
yield* Effect.addFinalizer(() =>
Effect.sync(() => {
const watchdog = setTimeout(() => process.exit(1), 10_000)
watchdog.unref()
shutdownWatchdogs.add(watchdog)
}),
)
const config = options.mode === "service" ? yield* ServiceConfig.read() : {}
const hostname = options.hostname ?? config.hostname ?? "127.0.0.1"
const port = options.port ?? config.port ?? (options.mode === "service" ? ServiceConfig.defaultPort() : undefined)
Expand Down Expand Up @@ -154,7 +164,7 @@ const processEffect = Effect.fnUntraced(function* (options: Options) {
? waitForStdinClose()
: Effect.never
}).pipe(Effect.annotateLogs({ role: "server" })),
)
).pipe(Effect.ensuring(Effect.sync(() => shutdownWatchdogs.forEach(clearTimeout))))
})

const infoJson = Schema.fromJsonString(Service.Info)
Expand Down
Loading