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

Merge pull request #3864 from timthelion/refactor/use-ctx-var-consistently

Browse Source 
Refactor: use ctx var consistently in daemon.go
This commit is contained in:
Jeromy Johnson
2017-04-16 23:57:54 -07:00
committed by GitHub
parent 1c50ec0c8e 739a62e35e
commit 307c54230b
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/ipfs/daemon.go
View File

@ -226,7 +226,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
if initialize {
cfg := req.InvocContext().ConfigRoot
cfg := ctx.ConfigRoot
if !fsrepo.IsInitialized(cfg) {
err := initWithDefaults(os.Stdout, cfg)
if err != nil {
@ -238,7 +238,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
// acquire the repo lock _before_ constructing a node. we need to make
// sure we are permitted to access the resources (datastore, etc.)
repo, err := fsrepo.Open(req.InvocContext().ConfigRoot)
repo, err := fsrepo.Open(ctx.ConfigRoot)
switch err {
default:
res.SetError(err, cmds.ErrNormal)
@ -268,7 +268,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
return
}
repo, err = fsrepo.Open(req.InvocContext().ConfigRoot)
repo, err = fsrepo.Open(ctx.ConfigRoot)
if err != nil {
res.SetError(err, cmds.ErrNormal)
return
@ -359,7 +359,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
}
}()
req.InvocContext().ConstructNode = func() (*core.IpfsNode, error) {
ctx.ConstructNode = func() (*core.IpfsNode, error) {
return node, nil
}