put immediate error second
License: MIT Signed-off-by: Steven Allen <steven@stebalien.com>
Steven Allen committed
Jan 11, 2018 at 14:03 UTC
0e680716bd8cb5660c47de5ab556b5f9441890fe
1 file changed
+18
-18
cmd/ipfs/daemon.go
+18
-18
@@ -343,7 +343,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
343
}
344
345
// construct api endpoint - every time
346
- err, apiErrc := serveHTTPApi(req, cctx)
346
+ apiErrc, err := serveHTTPApi(req, cctx)
347
if err != nil {
348
re.SetError(err, cmdkit.ErrNormal)
349
return
@@ -364,7 +364,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
364
}
365
366
// repo blockstore GC - if --enable-gc flag is present
367
- err, gcErrc := maybeRunGC(req, node)
367
+ gcErrc, err := maybeRunGC(req, node)
368
if err != nil {
369
re.SetError(err, cmdkit.ErrNormal)
370
return
@@ -374,7 +374,7 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
374
var gwErrc <-chan error
375
if len(cfg.Addresses.Gateway) > 0 {
376
var err error
377
- err, gwErrc = serveHTTPGateway(req, cctx)
377
+ gwErrc, err = serveHTTPGateway(req, cctx)
378
if err != nil {
379
re.SetError(err, cmdkit.ErrNormal)
380
return
@@ -396,10 +396,10 @@ func daemonFunc(req *cmds.Request, re cmds.ResponseEmitter, env cmds.Environment
396
}
397
398
// serveHTTPApi collects options, creates listener, prints status message and starts serving requests
399
-func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) {
399
+func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, error) {
400
cfg, err := cctx.GetConfig()
401
if err != nil {
402
- return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil
402
+ return nil, fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err)
403
}
404
405
apiAddr, _ := req.Options[commands.ApiOption].(string)
@@ -408,12 +408,12 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
408
}
409
apiMaddr, err := ma.NewMultiaddr(apiAddr)
410
if err != nil {
411
- return fmt.Errorf("serveHTTPApi: invalid API address: %q (err: %s)", apiAddr, err), nil
411
+ return nil, fmt.Errorf("serveHTTPApi: invalid API address: %q (err: %s)", apiAddr, err)
412
}
413
414
apiLis, err := manet.Listen(apiMaddr)
415
if err != nil {
416
- return fmt.Errorf("serveHTTPApi: manet.Listen(%s) failed: %s", apiMaddr, err), nil
416
+ return nil, fmt.Errorf("serveHTTPApi: manet.Listen(%s) failed: %s", apiMaddr, err)
417
}
418
// we might have listened to /tcp/0 - lets see what we are listing on
419
apiMaddr = apiLis.Multiaddr()
@@ -448,11 +448,11 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
448
449
node, err := cctx.ConstructNode()
450
if err != nil {
451
- return fmt.Errorf("serveHTTPApi: ConstructNode() failed: %s", err), nil
451
+ return nil, fmt.Errorf("serveHTTPApi: ConstructNode() failed: %s", err)
452
}
453
454
if err := node.Repo.SetAPIAddr(apiMaddr); err != nil {
455
- return fmt.Errorf("serveHTTPApi: SetAPIAddr() failed: %s", err), nil
455
+ return nil, fmt.Errorf("serveHTTPApi: SetAPIAddr() failed: %s", err)
456
}
457
458
errc := make(chan error)
@@ -460,7 +460,7 @@ func serveHTTPApi(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error
460
errc <- corehttp.Serve(node, apiLis.NetListener(), opts...)
461
close(errc)
462
}()
463
- return nil, errc
463
+ return errc, nil
464
}
465
466
// printSwarmAddrs prints the addresses of the host
@@ -495,15 +495,15 @@ func printSwarmAddrs(node *core.IpfsNode) {
495
}
496
497
// serveHTTPGateway collects options, creates listener, prints status message and starts serving requests
498
-func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan error) {
498
+func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (<-chan error, error) {
499
cfg, err := cctx.GetConfig()
500
if err != nil {
501
- return fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err), nil
501
+ return nil, fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err)
502
}
503
504
gatewayMaddr, err := ma.NewMultiaddr(cfg.Addresses.Gateway)
505
if err != nil {
506
- return fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err), nil
506
+ return nil, fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err)
507
}
508
509
writable, writableOptionFound := req.Options[writableKwd].(bool)
@@ -513,7 +513,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
513
514
gwLis, err := manet.Listen(gatewayMaddr)
515
if err != nil {
516
- return fmt.Errorf("serveHTTPGateway: manet.Listen(%s) failed: %s", gatewayMaddr, err), nil
516
+ return nil, fmt.Errorf("serveHTTPGateway: manet.Listen(%s) failed: %s", gatewayMaddr, err)
517
}
518
// we might have listened to /tcp/0 - lets see what we are listing on
519
gatewayMaddr = gwLis.Multiaddr()
@@ -539,7 +539,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
539
540
node, err := cctx.ConstructNode()
541
if err != nil {
542
- return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil
542
+ return nil, fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err)
543
}
544
545
errc := make(chan error)
@@ -547,7 +547,7 @@ func serveHTTPGateway(req *cmds.Request, cctx *oldcmds.Context) (error, <-chan e
547
errc <- corehttp.Serve(node, gwLis.NetListener(), opts...)
548
close(errc)
549
}()
550
- return nil, errc
550
+ return errc, nil
551
}
552
553
//collects options and opens the fuse mountpoint
@@ -581,7 +581,7 @@ func mountFuse(req *cmds.Request, cctx *oldcmds.Context) error {
581
return nil
582
}
583
584
-func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (error, <-chan error) {
584
+func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (<-chan error, error) {
585
enableGC, _ := req.Options[enableGCKwd].(bool)
586
if !enableGC {
587
return nil, nil
@@ -592,7 +592,7 @@ func maybeRunGC(req *cmds.Request, node *core.IpfsNode) (error, <-chan error) {
592
errc <- corerepo.PeriodicGC(req.Context, node)
593
close(errc)
594
}()
595
- return nil, errc
595
+ return errc, nil
596
}
597
598
// merge does fan-in of multiple read-only error channels