daemon: addressed CR comments
Henry committed
Jun 8, 2015 at 11:08 UTC
4b337bb7e8786bdab28cc27aa4b6ee8f5dc791a5
1 file changed
+17
-17
cmd/ipfs/daemon.go
+17
-17
@@ -196,7 +196,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
196
}
197
198
// construct api endpoint - every time
199
- err, apiErrc := mountHTTPapi(req)
199
+ err, apiErrc := serveHTTPApi(req)
200
if err != nil {
201
res.SetError(err, cmds.ErrNormal)
202
return
@@ -206,7 +206,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
206
var gwErrc <-chan error
207
if len(cfg.Addresses.Gateway) > 0 {
208
var err error
209
- err, gwErrc = mountHTTPgw(req)
209
+ err, gwErrc = serveHTTPGateway(req)
210
if err != nil {
211
res.SetError(err, cmds.ErrNormal)
212
return
@@ -236,21 +236,21 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
236
}
237
}
238
239
-// mountHTTPapi collects options, creates listener, prints status message and starts serving requests
240
-func mountHTTPapi(req cmds.Request) (error, <-chan error) {
239
+// serveHTTPApi collects options, creates listener, prints status message and starts serving requests
240
+func serveHTTPApi(req cmds.Request) (error, <-chan error) {
241
cfg, err := req.Context().GetConfig()
242
if err != nil {
243
- return fmt.Errorf("mountHTTPapi: GetConfig() failed: %s", err), nil
243
+ return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil
244
}
245
246
apiMaddr, err := ma.NewMultiaddr(cfg.Addresses.API)
247
if err != nil {
248
- return fmt.Errorf("mountHTTPapi: invalid API address: %q (err: %s)", cfg.Addresses.API, err), nil
248
+ return fmt.Errorf("serveHTTPApi: invalid API address: %q (err: %s)", cfg.Addresses.API, err), nil
249
}
250
251
apiLis, err := manet.Listen(apiMaddr)
252
if err != nil {
253
- return fmt.Errorf("mountHTTPapi: manet.Listen(%s) failed: %s", apiMaddr, err), nil
253
+ return fmt.Errorf("serveHTTPApi: manet.Listen(%s) failed: %s", apiMaddr, err), nil
254
}
255
// we might have listened to /tcp/0 - lets see what we are listing on
256
apiMaddr = apiLis.Multiaddr()
@@ -258,7 +258,7 @@ func mountHTTPapi(req cmds.Request) (error, <-chan error) {
258
259
unrestricted, _, err := req.Option(unrestrictedApiAccess).Bool()
260
if err != nil {
261
- return fmt.Errorf("mountHTTPapi: Option(%s) failed: %s", unrestrictedApiAccess, err), nil
261
+ return fmt.Errorf("serveHTTPApi: Option(%s) failed: %s", unrestrictedApiAccess, err), nil
262
}
263
264
apiGw := corehttp.NewGateway(corehttp.GatewayConfig{
@@ -293,7 +293,7 @@ func mountHTTPapi(req cmds.Request) (error, <-chan error) {
293
294
node, err := req.Context().ConstructNode()
295
if err != nil {
296
- return fmt.Errorf("mountHTTPgw: ConstructNode() failed: %s", err), nil
296
+ return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil
297
}
298
299
errc := make(chan error)
@@ -303,21 +303,21 @@ func mountHTTPapi(req cmds.Request) (error, <-chan error) {
303
return nil, errc
304
}
305
306
-// mountHTTPgw collects options, creates listener, prints status message and starts serving requests
307
-func mountHTTPgw(req cmds.Request) (error, <-chan error) {
306
+// serveHTTPGateway collects options, creates listener, prints status message and starts serving requests
307
+func serveHTTPGateway(req cmds.Request) (error, <-chan error) {
308
cfg, err := req.Context().GetConfig()
309
if err != nil {
310
- return fmt.Errorf("mountHTTPgw: GetConfig() failed: %s", err), nil
310
+ return fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err), nil
311
}
312
313
gatewayMaddr, err := ma.NewMultiaddr(cfg.Addresses.Gateway)
314
if err != nil {
315
- return fmt.Errorf("mountHTTPgw: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err), nil
315
+ return fmt.Errorf("serveHTTPGateway: invalid gateway address: %q (err: %s)", cfg.Addresses.Gateway, err), nil
316
}
317
318
writable, writableOptionFound, err := req.Option(writableKwd).Bool()
319
if err != nil {
320
- return fmt.Errorf("mountHTTPgw: req.Option(%s) failed: %s", writableKwd, err), nil
320
+ return fmt.Errorf("serveHTTPGateway: req.Option(%s) failed: %s", writableKwd, err), nil
321
}
322
if !writableOptionFound {
323
writable = cfg.Gateway.Writable
@@ -325,7 +325,7 @@ func mountHTTPgw(req cmds.Request) (error, <-chan error) {
325
326
gwLis, err := manet.Listen(gatewayMaddr)
327
if err != nil {
328
- return fmt.Errorf("mountHTTPgw: manet.Listen(%s) failed: %s", gatewayMaddr, err), nil
328
+ return fmt.Errorf("serveHTTPGateway: manet.Listen(%s) failed: %s", gatewayMaddr, err), nil
329
}
330
// we might have listened to /tcp/0 - lets see what we are listing on
331
gatewayMaddr = gwLis.Multiaddr()
@@ -348,7 +348,7 @@ func mountHTTPgw(req cmds.Request) (error, <-chan error) {
348
349
node, err := req.Context().ConstructNode()
350
if err != nil {
351
- return fmt.Errorf("mountHTTPgw: ConstructNode() failed: %s", err), nil
351
+ return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil
352
}
353
354
errc := make(chan error)
@@ -409,9 +409,9 @@ func merge(cs ...<-chan error) <-chan error {
409
}
410
wg.Done()
411
}
412
- wg.Add(len(cs))
412
for _, c := range cs {
413
if c != nil {
414
+ wg.Add(1)
415
go output(c)
416
}
417
}