opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-30 18:13:54 +08:00
Code Issues Projects Releases Wiki Activity

cmds: can't call SetError after SetOutput

Browse Source 
License: MIT
Signed-off-by: Steven Allen <steven@stebalien.com>
This commit is contained in:
Steven Allen
2018-01-25 18:02:59 -08:00
parent 699b2c4bb8
commit 1159abd83e
1 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
core/commands/dht.go
View File

@ -174,9 +174,6 @@ var findProvidersDhtCmd = &cmds.Command{
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
events := make(chan *notif.QueryEvent) events := make(chan *notif.QueryEvent)
ctx := notif.RegisterForQueryEvents(req.Context(), events) ctx := notif.RegisterForQueryEvents(req.Context(), events)
@ -186,6 +183,9 @@ var findProvidersDhtCmd = &cmds.Command{
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
pchan := dht.FindProvidersAsync(ctx, c, numProviders) pchan := dht.FindProvidersAsync(ctx, c, numProviders)
go func() { go func() {
defer close(outChan) defer close(outChan)
@ -535,18 +535,18 @@ Different key types can specify other 'best' rules.
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
events := make(chan *notif.QueryEvent)
ctx := notif.RegisterForQueryEvents(req.Context(), events)
dhtkey, err := escapeDhtKey(req.Arguments()[0]) dhtkey, err := escapeDhtKey(req.Arguments()[0])
if err != nil { if err != nil {
res.SetError(err, cmdkit.ErrNormal) res.SetError(err, cmdkit.ErrNormal)
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
events := make(chan *notif.QueryEvent)
ctx := notif.RegisterForQueryEvents(req.Context(), events)
go func() { go func() {
defer close(outChan) defer close(outChan)
for e := range events { for e := range events {
@ -650,9 +650,6 @@ NOTE: A value may not exceed 2048 bytes.
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
events := make(chan *notif.QueryEvent) events := make(chan *notif.QueryEvent)
ctx := notif.RegisterForQueryEvents(req.Context(), events) ctx := notif.RegisterForQueryEvents(req.Context(), events)
@ -662,6 +659,9 @@ NOTE: A value may not exceed 2048 bytes.
return return
} }
outChan := make(chan interface{})
res.SetOutput((<-chan interface{})(outChan))
data := req.Arguments()[1] data := req.Arguments()[1]
go func() { go func() {