mirror/kopia
1
0
Fork 0
mirror of https://github.com/kopia/kopia.git synced 2026-05-11 08:16:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(cli): server shutdown (#3608)

Browse Source 
* refactor(cli): add shutdownHTTPServer helper
* nit: reword comment to clarify

---------

Authored-by: Aaron Alpar <aaron.alpar@veeam.com>
This commit is contained in:
Julio López
2024-02-06 21:57:31 -08:00
committed by GitHub
parent ed9d0c281e
commit 4bec8e9bf8
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
cli/command_server_start.go
View File

@@ -208,7 +208,7 @@ func (c *commandServerStart) run(ctx context.Context) error {
ctx2, cancel := context.WithTimeout(ctx, c.shutdownGracePeriod)
defer cancel()
// wait for all connections to finish for up to 5 seconds
// wait for all connections to finish within a shutdown grace period
log(ctx2).Debugf("attempting graceful shutdown for %v", c.shutdownGracePeriod)
if serr := httpServer.Shutdown(ctx2); serr != nil {
@@ -223,11 +223,7 @@ func (c *commandServerStart) run(ctx context.Context) error {
}
c.svc.onTerminate(func() {
log(ctx).Infof("Shutting down...")
if serr := httpServer.Shutdown(ctx); serr != nil {
log(ctx).Debugf("unable to shut down: %v", serr)
}
shutdownHTTPServer(ctx, httpServer)
})
c.svc.onRepositoryFatalError(func(_ error) {
@@ -258,8 +254,7 @@ func (c *commandServerStart) run(ctx context.Context) error {
ctxutil.GoDetached(ctx, func(ctx context.Context) {
// consume all stdin and close the server when it closes
io.ReadAll(os.Stdin) //nolint:errcheck
log(ctx).Infof("Shutting down server...")
httpServer.Shutdown(ctx) //nolint:errcheck
shutdownHTTPServer(ctx, httpServer)
})
}
@@ -273,6 +268,14 @@ func (c *commandServerStart) run(ctx context.Context) error {
return errors.Wrap(srv.SetRepository(ctx, nil), "error setting active repository")
}
func shutdownHTTPServer(ctx context.Context, httpServer *http.Server) {
log(ctx).Infof("Shutting down HTTP server ...")
if err := httpServer.Shutdown(ctx); err != nil {
log(ctx).Errorln("unable to shut down HTTP server:", err)
}
}
func (c *commandServerStart) setupHandlers(srv *server.Server, m *mux.Router) {
if c.serverStartLegacyRepositoryAPI {
srv.SetupRepositoryAPIHandlers(m)