Merge pull request #227 from nspcc-dev/fast-improvements

cmd/neofs-rest-gw/main.go

@@ -127,6 +127,7 @@ func main() {
 	go neofsAPI.StartCallback()
 
 	<-ctx.Done()
+	neofsAPI.StopServices()
 	if err = e.Shutdown(ctx); err != nil {
 		logger.Fatal("shutdown http and https", zap.Error(err))
 	}

handlers/api.go

@@ -1,9 +1,11 @@
 package handlers
 
 import (
+	"context"
 	"errors"
 	"fmt"
 	"strings"
+	"sync"
 	"time"
 
 	"github.com/labstack/echo/v4"
@@ -153,3 +155,20 @@ func (a *RestAPI) RunServices() {
 	go a.pprofService.Start()
 	go a.prometheusService.Start()
 }
+
+// StopServices stops all running services with configured timeout.
+func (a *RestAPI) StopServices() {
+	ctx, cancel := context.WithTimeout(context.Background(), a.serviceShutdownTimeout)
+	defer cancel()
+	var wg sync.WaitGroup
+	wg.Add(2)
+	go func() {
+		defer wg.Done()
+		a.pprofService.ShutDown(ctx)
+	}()
+	go func() {
+		defer wg.Done()
+		a.prometheusService.ShutDown(ctx)
+	}()
+	wg.Wait()
+}