github_mirrors/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2025-01-23 17:20:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update restful/grpc servers shutdown stages (#3662)

Browse Source
This commit is contained in:
Kevin Wan 2023-10-23 21:03:05 +08:00 committed by GitHub
parent 00db97fcc1
commit c2ff00883a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/internal/starter.go
View File

@ -43,7 +43,7 @@ func start(host string, port int, handler http.Handler, run func(svr *http.Serve
} }
healthManager := health.NewHealthManager(fmt.Sprintf("%s-%s:%d", probeNamePrefix, host, port)) healthManager := health.NewHealthManager(fmt.Sprintf("%s-%s:%d", probeNamePrefix, host, port))
waitForCalled := proc.AddWrapUpListener(func() { waitForCalled := proc.AddShutdownListener(func() {
healthManager.MarkNotReady() healthManager.MarkNotReady()
if e := server.Shutdown(context.Background()); e != nil { if e := server.Shutdown(context.Background()); e != nil {
logx.Error(e) logx.Error(e)

2
zrpc/internal/rpcserver.go
View File

@ -76,7 +76,7 @@ func (s *rpcServer) Start(register RegisterFn) error {
// we need to make sure all others are wrapped up, // we need to make sure all others are wrapped up,
// so we do graceful stop at shutdown phase instead of wrap up phase // so we do graceful stop at shutdown phase instead of wrap up phase
waitForCalled := proc.AddWrapUpListener(func() { waitForCalled := proc.AddShutdownListener(func() {
if s.health != nil { if s.health != nil {
s.health.Shutdown() s.health.Shutdown()
} }

2
zrpc/internal/rpcserver_test.go
View File

@ -47,7 +47,7 @@ func TestRpcServer(t *testing.T) {
grpcServer.GracefulStop() grpcServer.GracefulStop()
lock.Unlock() lock.Unlock()
proc.WrapUp() proc.Shutdown()
wgDone.Wait() wgDone.Wait()
} }