Skip to content

Commit 304b34c

Browse files
committed
Use normal stop instead of graceful because stream RPC doesn't close otherwise
1 parent f9927d3 commit 304b34c

File tree

2 files changed

+1
-3
lines changed

2 files changed

+1
-3
lines changed

internal/mode/static/nginx/agent/command.go

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,6 @@ func (cs *commandService) Subscribe(in pb.CommandService_SubscribeServer) error
193193
}
194194
}
195195

196-
// TODO(sberman): current issue: when control plane restarts, agent doesn't re-establish a CreateConnection call,
197-
// so this fails.
198196
func (cs *commandService) waitForConnection(
199197
ctx context.Context,
200198
gi grpcContext.GrpcInfo,

internal/mode/static/nginx/agent/grpc/grpc.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ func (g *Server) Start(ctx context.Context) error {
8282
go func() {
8383
<-ctx.Done()
8484
g.logger.Info("Shutting down GRPC Server")
85-
server.GracefulStop()
85+
server.Stop()
8686
}()
8787

8888
return server.Serve(listener)

0 commit comments

Comments
 (0)