remove addCloser
Jeromy committed
Mar 14, 2015 at 15:05 UTC
eb228eb615e6c2ce02acfaf9a385a6b690be6888
1 file changed
+11
-10
core/core.go
+11
-10
@@ -295,24 +295,25 @@ func (n *IpfsNode) teardown() error {
295
n.Exchange,
296
n.Repo,
297
}
298
- addCloser := func(c io.Closer) { // use when field may be nil
299
- if c != nil {
300
- closers = append(closers, c)
301
- }
302
- }
298
299
if n.Blocks != nil {
305
- addCloser(n.Blocks)
300
+ closers = append(closers, n.Blocks)
301
}
302
if n.IpnsFs != nil {
308
- addCloser(n.IpnsFs)
303
+ closers = append(closers, n.IpnsFs)
304
+ }
305
+
306
+ if n.Bootstrapper != nil {
307
+ closers = append(closers, n.Bootstrapper)
308
}
309
311
- addCloser(n.Bootstrapper)
310
if dht, ok := n.Routing.(*dht.IpfsDHT); ok {
313
- addCloser(dht)
311
+ closers = append(closers, dht)
312
+ }
313
+
314
+ if n.PeerHost != nil {
315
+ closers = append(closers, n.PeerHost)
316
}
315
- addCloser(n.PeerHost)
317
318
var errs []error
319
for _, closer := range closers {