embed: share grpc connection for grpc json services
parent
10b1ba7886
commit
db7ab961bf
|
@ -160,28 +160,38 @@ func grpcHandlerFunc(grpcServer *grpc.Server, otherHandler http.Handler) http.Ha
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
type registerHandlerFunc func(context.Context, *gw.ServeMux, string, []grpc.DialOption) error
|
type registerHandlerFunc func(context.Context, *gw.ServeMux, *grpc.ClientConn) error
|
||||||
|
|
||||||
func (sctx *serveCtx) registerGateway(opts []grpc.DialOption) (*gw.ServeMux, error) {
|
func (sctx *serveCtx) registerGateway(opts []grpc.DialOption) (*gw.ServeMux, error) {
|
||||||
ctx := sctx.ctx
|
ctx := sctx.ctx
|
||||||
addr := sctx.l.Addr().String()
|
conn, err := grpc.DialContext(ctx, sctx.l.Addr().String(), opts...)
|
||||||
|
if err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
gwmux := gw.NewServeMux()
|
gwmux := gw.NewServeMux()
|
||||||
|
|
||||||
handlers := []registerHandlerFunc{
|
handlers := []registerHandlerFunc{
|
||||||
etcdservergw.RegisterKVHandlerFromEndpoint,
|
etcdservergw.RegisterKVHandler,
|
||||||
etcdservergw.RegisterWatchHandlerFromEndpoint,
|
etcdservergw.RegisterWatchHandler,
|
||||||
etcdservergw.RegisterLeaseHandlerFromEndpoint,
|
etcdservergw.RegisterLeaseHandler,
|
||||||
etcdservergw.RegisterClusterHandlerFromEndpoint,
|
etcdservergw.RegisterClusterHandler,
|
||||||
etcdservergw.RegisterMaintenanceHandlerFromEndpoint,
|
etcdservergw.RegisterMaintenanceHandler,
|
||||||
etcdservergw.RegisterAuthHandlerFromEndpoint,
|
etcdservergw.RegisterAuthHandler,
|
||||||
v3lockgw.RegisterLockHandlerFromEndpoint,
|
v3lockgw.RegisterLockHandler,
|
||||||
v3electiongw.RegisterElectionHandlerFromEndpoint,
|
v3electiongw.RegisterElectionHandler,
|
||||||
}
|
}
|
||||||
for _, h := range handlers {
|
for _, h := range handlers {
|
||||||
if err := h(ctx, gwmux, addr, opts); err != nil {
|
if err := h(ctx, gwmux, conn); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
go func() {
|
||||||
|
<-ctx.Done()
|
||||||
|
if cerr := conn.Close(); cerr != nil {
|
||||||
|
plog.Warningf("failed to close conn to %s: %v", sctx.l.Addr().String(), cerr)
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
|
||||||
return gwmux, nil
|
return gwmux, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue