Skip to content

serve: don't drop the server start error on the way out #889

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

serve: don't drop the server start error on the way out #889

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
14 changes: 14 additions & 0 deletions cmd/soft/serve/serve.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,20 @@ var (
}
continue
}
// A nil sig means doneOnce() closed `done` because the server
// goroutine returned, not because we got a real signal. The
// server's error sits in lch and the outer select could have
// dropped it (#645). Surface it before shutting down so that
// e.g. a permission-denied on :22 doesn't disappear silently.
if sig == nil {
select {
case err := <-lch:
if err != nil {
return fmt.Errorf("server error: %w", err)
}
default:
}
}
}

break
Expand Down