fix(dev): give serve the full shutdown grace before killing it
- dev.ShutdownGrace (internal, 15 seconds, longer than serve's 10-second drain) is the grace child.stop waits after SIGTERM, instead of 2 seconds - summer's delegates use the same constant (appShutdownGrace) - scaffolding docs say summer dev waits for serve's shutdown report (WR-03)
This commit is contained in:
@@ -19,6 +19,13 @@ import (
|
||||
|
||||
const defaultDebounce = 200 * time.Millisecond
|
||||
|
||||
// ShutdownGrace is how long a stopped app binary may take to exit after
|
||||
// SIGTERM before it is killed, for summer dev and summer's delegates alike.
|
||||
// It is longer than the 10-second shutdown timeout of serve (its request
|
||||
// drain) and the workers, so they finish a graceful shutdown and print
|
||||
// their report.
|
||||
const ShutdownGrace = 15 * time.Second
|
||||
|
||||
// Options customizes the watch loop. Tests inject Build and Start.
|
||||
type Options struct {
|
||||
Build func(ctx context.Context, appDir string, out io.Writer) error
|
||||
@@ -224,6 +231,8 @@ func startChild(ctx context.Context, opts Options, binPath string, args []string
|
||||
return &child{cmd: cmd, wait: ch}, nil
|
||||
}
|
||||
|
||||
// stop sends the child SIGTERM and waits for it to exit, killing it only
|
||||
// after ShutdownGrace.
|
||||
func (c *child) stop() {
|
||||
if c == nil || c.cmd == nil || c.cmd.Process == nil {
|
||||
return
|
||||
@@ -231,7 +240,7 @@ func (c *child) stop() {
|
||||
_ = c.cmd.Process.Signal(syscall.SIGTERM)
|
||||
select {
|
||||
case <-c.wait:
|
||||
case <-time.After(2 * time.Second):
|
||||
case <-time.After(ShutdownGrace):
|
||||
_ = c.cmd.Process.Kill()
|
||||
<-c.wait
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user