Skip to content

Commit 4b337bb

Browse files
cryptixcryptix
committedJun 8, 2015
daemon: addressed CR comments
·
v0.34.0-rc2floodsub-0
1 parent 07b3415 commit 4b337bb

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed
 

‎cmd/ipfs/daemon.go

+17-17
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
196196
}
197197

198198
// construct api endpoint - every time
199-
err, apiErrc := mountHTTPapi(req)
199+
err, apiErrc := serveHTTPApi(req)
200200
if err != nil {
201201
res.SetError(err, cmds.ErrNormal)
202202
return
@@ -206,7 +206,7 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
206206
var gwErrc <-chan error
207207
if len(cfg.Addresses.Gateway) > 0 {
208208
var err error
209-
err, gwErrc = mountHTTPgw(req)
209+
err, gwErrc = serveHTTPGateway(req)
210210
if err != nil {
211211
res.SetError(err, cmds.ErrNormal)
212212
return
@@ -236,29 +236,29 @@ func daemonFunc(req cmds.Request, res cmds.Response) {
236236
}
237237
}
238238

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) {
241241
cfg, err := req.Context().GetConfig()
242242
if err != nil {
243-
return fmt.Errorf("mountHTTPapi: GetConfig() failed: %s", err), nil
243+
return fmt.Errorf("serveHTTPApi: GetConfig() failed: %s", err), nil
244244
}
245245

246246
apiMaddr, err := ma.NewMultiaddr(cfg.Addresses.API)
247247
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
249249
}
250250

251251
apiLis, err := manet.Listen(apiMaddr)
252252
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
254254
}
255255
// we might have listened to /tcp/0 - lets see what we are listing on
256256
apiMaddr = apiLis.Multiaddr()
257257
fmt.Printf("API server listening on %s\n", apiMaddr)
258258

259259
unrestricted, _, err := req.Option(unrestrictedApiAccess).Bool()
260260
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
262262
}
263263

264264
apiGw := corehttp.NewGateway(corehttp.GatewayConfig{
@@ -293,7 +293,7 @@ func mountHTTPapi(req cmds.Request) (error, <-chan error) {
293293

294294
node, err := req.Context().ConstructNode()
295295
if err != nil {
296-
return fmt.Errorf("mountHTTPgw: ConstructNode() failed: %s", err), nil
296+
return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil
297297
}
298298

299299
errc := make(chan error)
@@ -303,29 +303,29 @@ func mountHTTPapi(req cmds.Request) (error, <-chan error) {
303303
return nil, errc
304304
}
305305

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) {
308308
cfg, err := req.Context().GetConfig()
309309
if err != nil {
310-
return fmt.Errorf("mountHTTPgw: GetConfig() failed: %s", err), nil
310+
return fmt.Errorf("serveHTTPGateway: GetConfig() failed: %s", err), nil
311311
}
312312

313313
gatewayMaddr, err := ma.NewMultiaddr(cfg.Addresses.Gateway)
314314
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
316316
}
317317

318318
writable, writableOptionFound, err := req.Option(writableKwd).Bool()
319319
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
321321
}
322322
if !writableOptionFound {
323323
writable = cfg.Gateway.Writable
324324
}
325325

326326
gwLis, err := manet.Listen(gatewayMaddr)
327327
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
329329
}
330330
// we might have listened to /tcp/0 - lets see what we are listing on
331331
gatewayMaddr = gwLis.Multiaddr()
@@ -348,7 +348,7 @@ func mountHTTPgw(req cmds.Request) (error, <-chan error) {
348348

349349
node, err := req.Context().ConstructNode()
350350
if err != nil {
351-
return fmt.Errorf("mountHTTPgw: ConstructNode() failed: %s", err), nil
351+
return fmt.Errorf("serveHTTPGateway: ConstructNode() failed: %s", err), nil
352352
}
353353

354354
errc := make(chan error)
@@ -409,9 +409,9 @@ func merge(cs ...<-chan error) <-chan error {
409409
}
410410
wg.Done()
411411
}
412-
wg.Add(len(cs))
413412
for _, c := range cs {
414413
if c != nil {
414+
wg.Add(1)
415415
go output(c)
416416
}
417417
}

0 commit comments

Comments
 (0)
Please sign in to comment.