cmd/ipfs2: daemon command: Handle lock before initializing node
Matt Bell committed
Oct 29, 2014 at 22:11 UTC
e01f1ba8a17a968ec77916c92bdc816b2ae47fd5
1 file changed
+6
-6
cmd/ipfs2/daemon.go
+6
-6
@@ -23,19 +23,19 @@ var daemonCmd = &cmds.Command{
23
func daemonFunc(res cmds.Response, req cmds.Request) {
24
ctx := req.Context()
25
26
- node, err := core.NewIpfsNode(ctx.Config, true)
26
+ lk, err := daemon.Lock(ctx.ConfigRoot)
27
if err != nil {
28
- res.SetError(err, cmds.ErrNormal)
28
+ res.SetError(fmt.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
29
return
30
}
31
- ctx.Node = node
31
+ defer lk.Close()
32
33
- lk, err := daemon.Lock(ctx.ConfigRoot)
33
+ node, err := core.NewIpfsNode(ctx.Config, true)
34
if err != nil {
35
- res.SetError(fmt.Errorf("Couldn't obtain lock. Is another daemon already running?"), cmds.ErrNormal)
35
+ res.SetError(err, cmds.ErrNormal)
36
return
37
}
38
- defer lk.Close()
38
+ ctx.Node = node
39
40
addr, err := ma.NewMultiaddr(ctx.Config.Addresses.API)
41
if err != nil {