diff options
| author | Florian Klink <flokli@flokli.de> | 2023-09-18T13·51+0300 |
|---|---|---|
| committer | clbot <clbot@tvl.fyi> | 2023-09-18T14·34+0000 |
| commit | 6c586bc2a7a49755b4b2566c034bc1affc92011d (patch) | |
| tree | 826be0c654fa0430b8abed47cb154a2d0bfc4749 /tvix/nar-bridge/pkg/server/server.go | |
| parent | 02aed32bf2627a969c15f358737abf5acb697dd4 (diff) | |
feat(tvix/nar-bridge): graceful shutdown r/6616
This gives existing clients 30s to finish their requests after receiving an interrupt. Change-Id: Ia9b0e662fd1ffbbb6c2d03f3dd6548b13cf3d241 Reviewed-on: https://cl.tvl.fyi/c/depot/+/9365 Autosubmit: flokli <flokli@flokli.de> Tested-by: BuildkiteCI Reviewed-by: Connor Brewster <cbrewster@hey.com>
Diffstat (limited to '')
| -rw-r--r-- | tvix/nar-bridge/pkg/server/server.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/tvix/nar-bridge/pkg/server/server.go b/tvix/nar-bridge/pkg/server/server.go index 0de38c84df..f58842bfa7 100644 --- a/tvix/nar-bridge/pkg/server/server.go +++ b/tvix/nar-bridge/pkg/server/server.go @@ -1,6 +1,7 @@ package server import ( + "context" "fmt" "net/http" "sync" @@ -13,6 +14,7 @@ import ( ) type Server struct { + srv *http.Server handler chi.Router directoryServiceClient storev1pb.DirectoryServiceClient @@ -73,8 +75,14 @@ func New( return s } +func (s *Server) Shutdown(ctx context.Context) error { + return s.srv.Shutdown(ctx) +} + +// ListenAndServer starts the webserver, and waits for it being closed or +// shutdown, after which it'll return ErrServerClosed. func (s *Server) ListenAndServe(addr string) error { - srv := &http.Server{ + s.srv = &http.Server{ Addr: addr, Handler: s.handler, ReadTimeout: 500 * time.Second, @@ -82,5 +90,5 @@ func (s *Server) ListenAndServe(addr string) error { IdleTimeout: 500 * time.Second, } - return srv.ListenAndServe() + return s.srv.ListenAndServe() } |