Skip to content
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

Jump to bottom

Implement graceful shutdown on Mac #618

Closed
wants to merge 8 commits into from
Closed

Implement graceful shutdown on Mac #618

Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4d7d7a8
hold cleanup until procKilledCh signal
sethbrasile Apr 30, 2024
0dcd9c5
signal to procKilledChan in existing deferred func
sethbrasile Apr 30, 2024
fec348c
without this can't exit when non zero exit code
sethbrasile Apr 30, 2024
7034632
Revert "without this can't exit when non zero exit code"
sethbrasile Apr 30, 2024
8e99edc
Merge branch 'cosmtrek:master' into master
sethbrasile May 15, 2024
674a5b9
use cleanup
xiantang Jun 23, 2024
a759095
fix test case rerun
xiantang Jun 23, 2024
609de5a
upgrade gomod version
xiantang Jun 23, 2024
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
5 changes: 4 additions & 1 deletion runner/engine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ type Engine struct {
binStopCh chan bool
exitCh chan bool

procKillWg sync.WaitGroup
mu sync.RWMutex
watchers uint
round uint64
Expand Down Expand Up @@ -538,6 +539,7 @@ func (e *Engine) runBin() error {
case <-killCh:
return
default:
e.procKillWg.Add(1)
command := strings.Join(append([]string{e.config.Build.Bin}, e.runArgs...), " ")
cmd, stdout, stderr, _ := e.startCmd(command)
processExit := make(chan struct{})
Expand Down Expand Up @@ -573,6 +575,7 @@ func (e *Engine) runBin() error {
default:
e.runnerLog("Process Exit with Code: %v", state.ExitCode())
}
e.procKillWg.Done()

if !e.config.Build.Rerun {
return
Expand Down Expand Up @@ -622,7 +625,7 @@ func (e *Engine) cleanup() {
}

e.mainDebug("waiting for exit...")

e.procKillWg.Wait()
e.running = false
e.mainDebug("exited")
}
Expand Down
Loading