Skip to content

Commit

Permalink
core/commands/unixfs/ls: Replace TODO context with command context
Browse files Browse the repository at this point in the history
Discussing this on IRC ([1] through [2]), Jeromy and I decided that
we'd really like a way to configure per-command [3] and per-action
timeouts, but until we have that we want to leave the minute limit
here.  We also decided that the use of TODO here instead of the
per-command req.Context().Context was a bug, which I'm fixing with
this commit.

[1]: https://botbot.me/freenode/ipfs/2015-06-12/?msg=41714126&page=4
[2]: https://botbot.me/freenode/ipfs/2015-06-12/?msg=41715618&page=4
[3]: #1325

License: MIT
Signed-off-by: W. Trevor King <wking@tremily.us>
  • Loading branch information
wking committed Jun 13, 2015
1 parent e5f3ae9 commit 180ed0a
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/commands/unixfs/ls.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ directories, the child size is the IPFS link size.
case unixfspb.Data_Directory:
output[i].Links = make([]LsLink, len(merkleNode.Links))
for j, link := range merkleNode.Links {
getCtx, cancel := context.WithTimeout(context.TODO(), time.Minute)
getCtx, cancel := context.WithTimeout(ctx, time.Minute)
defer cancel()
link.Node, err = link.GetNode(getCtx, node.DAG)
if err != nil {
Expand Down

0 comments on commit 180ed0a

Please sign in to comment.