Refactor: use ctx var consistently in daemon.go
License: MIT Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz>
Timothy Hobbs committed
Apr 15, 2017 at 18:08 UTC
739a62e35e12e900a47c0892b4243f8c157bf78e
1 file changed
+4
-4
cmd/ipfs/daemon.go
+4
-4
@@ -226,7 +226,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
226
227
if initialize {
228
229
- cfg := req.InvocContext().ConfigRoot
229
+ cfg := ctx.ConfigRoot
230
if !fsrepo.IsInitialized(cfg) {
231
err := initWithDefaults(os.Stdout, cfg)
232
if err != nil {
@@ -238,7 +238,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
238
239
// acquire the repo lock _before_ constructing a node. we need to make
240
// sure we are permitted to access the resources (datastore, etc.)
241
- repo, err := fsrepo.Open(req.InvocContext().ConfigRoot)
241
+ repo, err := fsrepo.Open(ctx.ConfigRoot)
242
switch err {
243
default:
244
res.SetError(err, cmds.ErrNormal)
@@ -268,7 +268,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
268
return
269
}
270
271
- repo, err = fsrepo.Open(req.InvocContext().ConfigRoot)
271
+ repo, err = fsrepo.Open(ctx.ConfigRoot)
272
if err != nil {
273
res.SetError(err, cmds.ErrNormal)
274
return
@@ -359,7 +359,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
359
}
360
}()
361
362
- req.InvocContext().ConstructNode = func() (*core.IpfsNode, error) {
362
+ ctx.ConstructNode = func() (*core.IpfsNode, error) {
363
return node, nil
364
}
365