fix: grace shutdown for gw (#1478)

Signed-off-by: rfyiamcool <rfyiamcool@163.com>
This commit is contained in:
fengyun.rui
2023-11-29 10:44:37 +08:00
committed by GitHub
parent 4c7e0295bf
commit 35bac04f58
4 changed files with 121 additions and 23 deletions
+16 -5
View File
@@ -19,6 +19,7 @@ import (
"time"
"github.com/OpenIMSDK/tools/utils"
"golang.org/x/sync/errgroup"
"github.com/openimsdk/open-im-server/v3/pkg/common/config"
)
@@ -43,12 +44,22 @@ func RunWsAndServer(rpcPort, wsPort, prometheusPort int) error {
if err != nil {
return err
}
hubServer := NewServer(rpcPort, prometheusPort, longServer)
go func() {
err := hubServer.Start()
wg := errgroup.Group{}
wg.Go(func() error {
err = hubServer.Start()
if err != nil {
panic(utils.Wrap1(err))
return utils.Wrap1(err)
}
}()
return hubServer.LongConnServer.Run()
return err
})
wg.Go(func() error {
return hubServer.LongConnServer.Run()
})
err = wg.Wait()
return err
}