mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

*: put gateway stubs into their own packages

Browse Source 
Fixes #7773
This commit is contained in:
Anthony Romano
2017-04-19 12:48:02 -07:00
parent fd11523af9
commit 393e4335b7
4 changed files with 109 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
embed/serve.go
View File

@ -27,10 +27,12 @@ import (
"github.com/coreos/etcd/etcdserver/api/v3client"
"github.com/coreos/etcd/etcdserver/api/v3election"
"github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb"
v3electiongw "github.com/coreos/etcd/etcdserver/api/v3election/v3electionpb/gw"
"github.com/coreos/etcd/etcdserver/api/v3lock"
"github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb"
v3lockgw "github.com/coreos/etcd/etcdserver/api/v3lock/v3lockpb/gw"
"github.com/coreos/etcd/etcdserver/api/v3rpc"
pb "github.com/coreos/etcd/etcdserver/etcdserverpb"
etcdservergw "github.com/coreos/etcd/etcdserver/etcdserverpb/gw"
"github.com/coreos/etcd/pkg/debugutil"
"github.com/cockroachdb/cmux"
@ -178,14 +180,14 @@ func (sctx *serveCtx) registerGateway(opts []grpc.DialOption) (*gw.ServeMux, err
gwmux := gw.NewServeMux()
handlers := []registerHandlerFunc{
pb.RegisterKVHandlerFromEndpoint,
pb.RegisterWatchHandlerFromEndpoint,
pb.RegisterLeaseHandlerFromEndpoint,
pb.RegisterClusterHandlerFromEndpoint,
pb.RegisterMaintenanceHandlerFromEndpoint,
pb.RegisterAuthHandlerFromEndpoint,
v3lockpb.RegisterLockHandlerFromEndpoint,
v3electionpb.RegisterElectionHandlerFromEndpoint,
etcdservergw.RegisterKVHandlerFromEndpoint,
etcdservergw.RegisterWatchHandlerFromEndpoint,
etcdservergw.RegisterLeaseHandlerFromEndpoint,
etcdservergw.RegisterClusterHandlerFromEndpoint,
etcdservergw.RegisterMaintenanceHandlerFromEndpoint,
etcdservergw.RegisterAuthHandlerFromEndpoint,
v3lockgw.RegisterLockHandlerFromEndpoint,
v3electiongw.RegisterElectionHandlerFromEndpoint,
}
for _, h := range handlers {
if err := h(ctx, gwmux, addr, opts); err != nil {