cerc-io/lotus
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 27 Wiki Activity

jsonrpc: fix chan handler registration race

Browse Source
This commit is contained in:
Łukasz Magiera 2019-07-23 00:45:20 +02:00
parent fd40f9a82a
commit 3e8afa9511
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/jsonrpc/handler.go
View File

@ -174,14 +174,17 @@ func (h handlers) handle(ctx context.Context, req request, w func(func(io.Writer
} }
if handler.valOut != -1 { if handler.valOut != -1 {
resp.Result = callResult[handler.valOut].Interface() resp.Result = callResult[handler.valOut].Interface()
if reflect.TypeOf(resp.Result).Kind() == reflect.Chan {
//noinspection GoNilness // already checked above
resp.Result = chOut(callResult[handler.valOut])
}
} }
w(func(w io.Writer) { w(func(w io.Writer) {
if resp.Result != nil && reflect.TypeOf(resp.Result).Kind() == reflect.Chan {
// this must happen in the writer callback, otherwise we may start sending
// channel messages before we send this response
//noinspection GoNilness // already checked above
resp.Result = chOut(callResult[handler.valOut])
}
if err := json.NewEncoder(w).Encode(resp); err != nil { if err := json.NewEncoder(w).Encode(resp); err != nil {
fmt.Println(err) fmt.Println(err)
return return