qugalet/gotosocial
1
0
Fork 0
mirror of https://github.com/superseriousbusiness/gotosocial.git synced 2025-02-04 11:55:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[bugfix] shut down LE server nicely (#3714)

Browse source 
* [bugfix] shut down LE server nicely
This commit is contained in:
tobi 2025-01-31 13:45:39 +01:00 committed by GitHub
parent b9e0689359
commit 8a9422aa78
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 38 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
internal/router/router.go
View file

@ -48,6 +48,7 @@
type Router struct {
engine *gin.Engine
srv *http.Server
leSrv *http.Server
}
// New returns a new Router, which wraps
@ -185,15 +186,38 @@ func (r *Router) Start() error {
// Stop shuts down the router nicely.
func (r *Router) Stop() error {
log.Infof(nil, "shutting down http router with %s grace period", shutdownTimeout)
timeout, cancel := context.WithTimeout(context.Background(), shutdownTimeout)
defer cancel()
ctx := context.Background()
if err := r.srv.Shutdown(timeout); err != nil {
return fmt.Errorf("error shutting down http router: %s", err)
// Shut down "main" server.
if err := stopServer(ctx, r.srv, "http server"); err != nil {
return err
}
log.Info(nil, "http router closed connections and shut down gracefully")
// Shut down letsencrypt
// server if enabled.
if r.leSrv != nil {
if err := stopServer(ctx, r.leSrv, "letsencrypt http server"); err != nil {
return err
}
}
return nil
}
func stopServer(
ctx context.Context,
s *http.Server,
name string,
) error {
timeout, cancel := context.WithTimeout(ctx, shutdownTimeout)
defer cancel()
log.Infof(nil, "shutting down %s with %s grace period", name, shutdownTimeout)
if err := s.Shutdown(timeout); err != nil {
return fmt.Errorf("error shutting down %s: %w", name, err)
}
log.Infof(ctx, "%s closed connections and shut down gracefully", name)
return nil
}
@ -228,8 +252,8 @@ func (r *Router) customTLS(
// letsEncryptTLS modifies the router's underlying http
// server to use LetsEncrypt via an ACME Autocert manager.
//
// It also starts a listener on the configured LetsEncrypt
// port to validate LE requests.
// It also sets r.leSrv and starts a listener on the
// configured LetsEncrypt port to validate LE requests.
func (r *Router) letsEncryptTLS() (func() error, error) {
acm := &autocert.Manager{
Prompt: autocert.AcceptTOS,
@ -261,17 +285,18 @@ func (r *Router) letsEncryptTLS() (func() error, error) {
// Take our own copy of the HTTP server,
// and update it to serve LetsEncrypt
// requests via the autocert manager.
leSrv := (*r.srv) //nolint:govet
leSrv.Handler = acm.HTTPHandler(fallback)
leSrv.Addr = fmt.Sprintf("%s:%d",
r.leSrv = new(http.Server) //nolint:gosec
*r.leSrv = (*r.srv) //nolint:govet
r.leSrv.Handler = acm.HTTPHandler(fallback)
r.leSrv.Addr = fmt.Sprintf("%s:%d",
config.GetBindAddress(),
config.GetLetsEncryptPort(),
)
go func() {
// Start the LetsEncrypt autocert manager HTTP server.
log.Infof(nil, "letsencrypt listening on %s", leSrv.Addr)
if err := leSrv.ListenAndServe(); err != nil &&
log.Infof(nil, "letsencrypt listening on %s", r.leSrv.Addr)
if err := r.leSrv.ListenAndServe(); err != nil &&
err != http.ErrServerClosed {
log.Panicf(nil, "letsencrypt: listen: %v", err)
}