sendnrw/pocket-id
2
0
Fork 0
mirror of https://github.com/pocket-id/pocket-id.git synced 2026-05-14 08:59:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: pass context to shutdownServer

Browse Source
This commit is contained in:
Elias Schneider
2026-04-19 20:14:20 +02:00
parent 444f7ff2b0
commit ff26c4273a
1 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/internal/bootstrap/router_bootstrap.go
View File

@@ -264,7 +264,7 @@ func runServer(ctx context.Context, config *serverConfig) error {
notifySystemdReady()
<-ctx.Done()
return shutdownServer(config.server)
return shutdownServer(ctx, config.server)
}
func startCertWatcher(ctx context.Context, certProvider *tlsCertProvider) (*fsnotify.Watcher, error) {
@@ -321,10 +321,9 @@ func notifySystemdReady() {
}
}
func shutdownServer(srv *http.Server) error {
// Note we use the background context here as ctx has been canceled already
shutdownCtx, shutdownCancel := context.WithTimeout(context.Background(), 5*time.Second)
shutdownErr := srv.Shutdown(shutdownCtx) //nolint:contextcheck
func shutdownServer(ctx context.Context, srv *http.Server) error {
shutdownCtx, shutdownCancel := context.WithTimeout(context.WithoutCancel(ctx), 5*time.Second)
shutdownErr := srv.Shutdown(shutdownCtx)
shutdownCancel()
if shutdownErr != nil {
// Log the error only (could be context canceled)