Exit non-zero when the HTTP listener fails (closes #200)
All checks were successful
check / check (push) Successful in 6m20s
All checks were successful
check / check (push) Successful in 6m20s
The fx OnStart hook returned as soon as the serving goroutine was spawned, so a failed listen was discovered only inside that goroutine. It logged the error and cancelled the server's own context, which nothing outside the goroutine observes: fx reported RUNNING and the process stayed alive with nothing bound. The service was down and looked up, so systemd Restart=on-failure and Docker restart policies never fired. The Server now takes fx.Shutdowner and, on a listen failure, asks it to stop the app with ListenFailureExitCode. Shutdown runs through fx's normal stop sequence, so every OnStop hook — including the HTTP drain and the database close — still executes; the clean-shutdown path is untouched. Server.exitCode goes with it. Its only writer set it to zero during cleanShutdown and its only reader was serve()'s return value, which Run discards; the process status is fx's to decide. Left in place it would have been a genuine data race, since the new path makes cleanShutdown and serve()'s return run concurrently under -race. Verified by TestListenFailure_ShutsDownTheApp, which occupies a port, starts the wired app on it, and requires a non-zero shutdown signal within two seconds. Reverting the fix fails it with "listen failure left the app running".
This commit is contained in:
@@ -43,10 +43,7 @@ func (s *Server) serveUntilShutdown() {
|
||||
err := s.httpServer.ListenAndServe()
|
||||
if err != nil && !errors.Is(err, http.ErrServerClosed) {
|
||||
s.log.Error("listen error", "error", err)
|
||||
|
||||
if s.cancelFunc != nil {
|
||||
s.cancelFunc()
|
||||
}
|
||||
s.shutdownOnListenFailure()
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user