From ffc77d336cf3b58aa7f72052ac4b5ee99f868da1 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Sun, 3 Jan 2016 11:23:45 -0800 Subject: [PATCH] etcdserver/api/v3rpc: watch with storagepb.WatchResponse --- etcdserver/api/v3rpc/watch.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/etcdserver/api/v3rpc/watch.go b/etcdserver/api/v3rpc/watch.go index df8ca437db84..7b28bf67cc70 100644 --- a/etcdserver/api/v3rpc/watch.go +++ b/etcdserver/api/v3rpc/watch.go @@ -19,7 +19,6 @@ import ( pb "github.com/coreos/etcd/etcdserver/etcdserverpb" "github.com/coreos/etcd/storage" - "github.com/coreos/etcd/storage/storagepb" ) type watchServer struct { @@ -111,20 +110,12 @@ func (sws *serverWatchStream) recvLoop() error { func (sws *serverWatchStream) sendLoop() { for { select { - case evs, ok := <-sws.watchStream.Chan(): + case wresp, ok := <-sws.watchStream.Chan(): if !ok { return } - // TODO: evs is []storagepb.Event type - // either return []*storagepb.Event from storage package - // or define protocol buffer with []storagepb.Event. - events := make([]*storagepb.Event, len(evs)) - for i := range evs { - events[i] = &evs[i] - } - - err := sws.gRPCStream.Send(&pb.WatchResponse{Events: events}) + err := sws.gRPCStream.Send(&pb.WatchResponse{WatchId: wresp.WatchID, Events: wresp.Events}) storage.ReportEventReceived() if err != nil { return