Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

clientv3: typedef <-chan WatchResponse to WatchChan

Browse Source
This commit is contained in:
Anthony Romano
2016-02-11 15:48:47 -08:00
parent 8e411b1b3b
commit 2415303991
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
clientv3/integration/watch_test.go
View File

@@ -35,7 +35,7 @@ type watchctx struct {
w clientv3.Watcher
wclient *clientv3.Client
kv clientv3.KV
ch <-chan clientv3.WatchResponse
ch clientv3.WatchChan
}
func runWatchTest(t *testing.T, f watcherTest) {

14
clientv3/watch.go
View File

@@ -24,18 +24,20 @@ import (
storagepb "github.com/coreos/etcd/storage/storagepb"
)
type WatchChan <-chan WatchResponse
type Watcher interface {
// Watch watches on a single key. The watched events will be returned
// through the returned channel.
// If the watch is slow or the required rev is compacted, the watch request
// might be canceled from the server-side and the chan will be closed.
Watch(cxt context.Context, key string, rev int64) <-chan WatchResponse
Watch(ctx context.Context, key string, rev int64) WatchChan
// Watch watches on a prefix. The watched events will be returned
// WatchPrefix watches on a prefix. The watched events will be returned
// through the returned channel.
// If the watch is slow or the required rev is compacted, the watch request
// might be canceled from the server-side and the chan will be closed.
WatchPrefix(cxt context.Context, prefix string, rev int64) <-chan WatchResponse
WatchPrefix(ctx context.Context, prefix string, rev int64) WatchChan
// Close closes the watcher and cancels all watch requests.
Close() error
@@ -125,11 +127,11 @@ func NewWatcher(c *Client) Watcher {
return w
}
func (w *watcher) Watch(ctx context.Context, key string, rev int64) <-chan WatchResponse {
func (w *watcher) Watch(ctx context.Context, key string, rev int64) WatchChan {
return w.watch(ctx, key, "", rev)
}
func (w *watcher) WatchPrefix(ctx context.Context, prefix string, rev int64) <-chan WatchResponse {
func (w *watcher) WatchPrefix(ctx context.Context, prefix string, rev int64) WatchChan {
return w.watch(ctx, "", prefix, rev)
}
@@ -143,7 +145,7 @@ func (w *watcher) Close() error {
}
// watch posts a watch request to run() and waits for a new watcher channel
func (w *watcher) watch(ctx context.Context, key, prefix string, rev int64) <-chan WatchResponse {
func (w *watcher) watch(ctx context.Context, key, prefix string, rev int64) WatchChan {
retc := make(chan chan WatchResponse, 1)
wr := &watchRequest{ctx: ctx, key: key, prefix: prefix, rev: rev, retc: retc}
// submit request