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

Refactor: use ctx var consistently in daemon.go

Browse Source 
License: MIT
Signed-off-by: Timothy Hobbs <timothyhobbs@seznam.cz>
This commit is contained in:
Timothy Hobbs
2017-04-15 18:08:27 +02:00
parent 1c50ec0c8e
commit 739a62e35e
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 { if initialize {
cfg := req.InvocContext().ConfigRoot cfg := ctx.ConfigRoot
if !fsrepo.IsInitialized(cfg) { if !fsrepo.IsInitialized(cfg) {
err := initWithDefaults(os.Stdout, cfg) err := initWithDefaults(os.Stdout, cfg)
if err != nil { 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 // acquire the repo lock _before_ constructing a node. we need to make
// sure we are permitted to access the resources (datastore, etc.) // 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 { switch err {
default: default:
res.SetError(err, cmds.ErrNormal) res.SetError(err, cmds.ErrNormal)
@ -268,7 +268,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
return return
} }
repo, err = fsrepo.Open(req.InvocContext().ConfigRoot) repo, err = fsrepo.Open(ctx.ConfigRoot)
if err != nil { if err != nil {
res.SetError(err, cmds.ErrNormal) res.SetError(err, cmds.ErrNormal)
return 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 return node, nil
} }