Skip to content

Prevent orphaned dev processes on shutdown #2

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
deverman wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Prevent orphaned dev processes on shutdown #2

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: 9 additions & 3 deletions Sources/SagaCLI/DevCommand.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,9 @@ private final class DevCoordinator: @unchecked Sendable {
}

func start() throws {
// Recompile and shutdown both mutate siteProcess, so they must share one queue.
let lifecycleQueue = DispatchQueue(label: "Saga.Lifecycle")

// Set up SIGUSR2 handler — Saga signals us when a content rebuild completes so we can reload browsers
signal(SIGUSR2, SIG_IGN)
let sigusr2Source = DispatchSource.makeSignalSource(signal: SIGUSR2, queue: DispatchQueue(label: "Saga.Signal"))
Expand All @@ -59,7 +62,7 @@ private final class DevCoordinator: @unchecked Sendable {

// Set up SIGUSR1 handler — Saga signals us when Swift source files change so we can recompile
signal(SIGUSR1, SIG_IGN)
let sigusr1Source = DispatchSource.makeSignalSource(signal: SIGUSR1, queue: DispatchQueue(label: "Saga.Recompile"))
let sigusr1Source = DispatchSource.makeSignalSource(signal: SIGUSR1, queue: lifecycleQueue)
sigusr1Source.setEventHandler { [weak self] in self?.recompileAndRelaunch() }
sigusr1Source.resume()

Expand Down Expand Up @@ -110,10 +113,13 @@ private final class DevCoordinator: @unchecked Sendable {
openBrowser(url: "http://localhost:\(port)/")

// Handle Ctrl+C shutdown
let sigintSrc = DispatchSource.makeSignalSource(signal: SIGINT, queue: DispatchQueue(label: "Saga.Signals"))
let sigintSrc = DispatchSource.makeSignalSource(signal: SIGINT, queue: lifecycleQueue)
sigintSrc.setEventHandler { [weak self] in
print("\nShutting down...")
self?.siteProcess?.terminate()
if let siteProcess = self?.siteProcess, siteProcess.isRunning {
siteProcess.terminate()
siteProcess.waitUntilExit()
}
self?.server?.stop()
Foundation.exit(0)
}
Expand Down