Merge pull request #3880 from xiang90/fix_stop

etcdmain: fix unstoppable startEtcd function
This commit is contained in:
Xiang Li 2015-11-17 09:18:27 -08:00
commit c0353697da

View File

@ -323,7 +323,7 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
grpcServer := grpc.NewServer()
etcdserverpb.RegisterKVServer(grpcServer, v3rpc.NewKVServer(s))
etcdserverpb.RegisterWatchServer(grpcServer, v3rpc.NewWatchServer(s.Watchable()))
go plog.Fatal(grpcServer.Serve(v3l))
go func() { plog.Fatal(grpcServer.Serve(v3l)) }()
}
return s.StopNotify(), nil