fluencelabs/tendermint
1
0
Fork 0
mirror of https://github.com/fluencelabs/tendermint synced 2025-06-20 16:36:31 +00:00
Code Issues Projects Releases Wiki Activity

httpclient: do not close the out channel

Browse Source
This commit is contained in:
Anton Kaliaev
2019-02-11 16:04:20 +04:00
parent 1a6eb2ef00
commit 647f68ee6e
1 changed files with 2 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
rpc/client/httpclient.go
View File

@ -325,9 +325,8 @@ func (w *WSEvents) Unsubscribe(ctx context.Context, subscriber, query string) er
} }
w.mtx.Lock() w.mtx.Lock()
out, ok := w.subscriptions[query] _, ok := w.subscriptions[query]
if ok { if ok {
close(out)
delete(w.subscriptions, query) delete(w.subscriptions, query)
} }
w.mtx.Unlock() w.mtx.Unlock()
@ -343,9 +342,6 @@ func (w *WSEvents) UnsubscribeAll(ctx context.Context, subscriber string) error
} }
w.mtx.Lock() w.mtx.Lock()
for _, out := range w.subscriptions {
close(out)
}
w.subscriptions = make(map[string]chan ctypes.ResultEvent) w.subscriptions = make(map[string]chan ctypes.ResultEvent)
w.mtx.Unlock() w.mtx.Unlock()
@ -389,8 +385,6 @@ func (w *WSEvents) eventListener() {
continue continue
} }
// NOTE: writing also happens inside mutex so we can't close a channel in
// Unsubscribe/UnsubscribeAll.
w.mtx.RLock() w.mtx.RLock()
if out, ok := w.subscriptions[result.Query]; ok { if out, ok := w.subscriptions[result.Query]; ok {
if cap(out) == 0 { if cap(out) == 0 {
@ -399,7 +393,7 @@ func (w *WSEvents) eventListener() {
select { select {
case out <- *result: case out <- *result:
default: default:
w.Logger.Error("wanted to publish ResultEvent, but out channel is full", "ResultEvent", result, "query", result.Query) w.Logger.Error("wanted to publish ResultEvent, but out channel is full", "result", result, "query", result.Query)
} }
} }
} }