From 634d4e0fe3c359f2f2c602d73399774563684c41 Mon Sep 17 00:00:00 2001 From: Bryan Boreham Date: Wed, 10 Sep 2014 13:45:56 +0100 Subject: [PATCH] cosmetic --- connection_maker.go | 14 +++++++------- types.go | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/connection_maker.go b/connection_maker.go index 9cd6b945..62df7e5f 100644 --- a/connection_maker.go +++ b/connection_maker.go @@ -95,6 +95,7 @@ func (cm *ConnectionMaker) queryLoop(queryChan <-chan *ConnectionMakerInteractio func (cm *ConnectionMaker) checkStateAndAttemptConnections(now time.Time) { ourself := cm.router.Ourself + // Any targets that are now connected, we don't need to attempt any more for address, target := range cm.targets { if _, found := ourself.ConnectionOn(address); found { @@ -108,6 +109,7 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections(now time.Time) { delete(cm.targets, address) } } else if target.isCmdLine { + // This is a target that we are not connected to - if we are not currently attempting to connect, make sure we record it as unconnected if target.state != CSAttempting { target.state = CSUnconnected } @@ -135,13 +137,11 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections(now time.Time) { }) }) - { - for address, target := range cm.targets { - if target.state == CSUnconnected && now.After(target.tryAfter) { - target.attemptCount += 1 - target.state = CSAttempting - go cm.attemptConnection(address, target.isCmdLine) - } + for address, target := range cm.targets { + if target.state == CSUnconnected && now.After(target.tryAfter) { + target.attemptCount += 1 + target.state = CSAttempting + go cm.attemptConnection(address, target.isCmdLine) } } } diff --git a/types.go b/types.go index c3b93394..3c0c730d 100644 --- a/types.go +++ b/types.go @@ -155,7 +155,7 @@ type Topology struct { type ConnectionMakerInteraction struct { Interaction - address string + address string } type ConnectionMaker struct {