From 998130fa9eaf26188a247317e106c597abd685bb Mon Sep 17 00:00:00 2001
From: Paul Bellamy <paul.a.bellamy@gmail.com>
Date: Wed, 27 May 2015 16:47:54 +0100
Subject: [PATCH] Reformatting connection maker target JSON output

So `LastError` is forced to a string, not an object.
---
 router/connection_maker.go | 34 +++++++++++++++++-----------------
 router/json.go             | 17 +++++++++++++++++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/router/connection_maker.go b/router/connection_maker.go
index adb67258..2208e841 100644
--- a/router/connection_maker.go
+++ b/router/connection_maker.go
@@ -25,10 +25,10 @@ type ConnectionMaker struct {
 
 // Information about an address where we may find a peer
 type Target struct {
-	Attempting  bool          `json:"Attempting,omitempty"`  // are we currently attempting to connect there?
-	LastError   error         `json:"LastError,omitempty"`   // reason for disconnection last time
-	TryAfter    time.Time     `json:"TryAfter,omitempty"`    // next time to try this address
-	TryInterval time.Duration `json:"TryInterval,omitempty"` // backoff time on next failure
+	attempting  bool          // are we currently attempting to connect there?
+	lastError   error         // reason for disconnection last time
+	tryAfter    time.Time     // next time to try this address
+	tryInterval time.Duration // backoff time on next failure
 }
 
 type ConnectionMakerAction func() bool
@@ -68,7 +68,7 @@ func (cm *ConnectionMaker) InitiateConnections(peers []string) []error {
 			cm.directPeers[peer] = addr
 			// curtail any existing reconnect interval
 			if target, found := cm.targets[addr.String()]; found {
-				target.TryAfter, target.TryInterval = tryImmediately()
+				target.tryAfter, target.tryInterval = tryImmediately()
 			}
 		}
 		return true
@@ -88,9 +88,9 @@ func (cm *ConnectionMaker) ForgetConnections(peers []string) {
 func (cm *ConnectionMaker) ConnectionTerminated(address string, err error) {
 	cm.actionChan <- func() bool {
 		if target, found := cm.targets[address]; found {
-			target.Attempting = false
-			target.LastError = err
-			target.TryAfter, target.TryInterval = tryAfter(target.TryInterval)
+			target.attempting = false
+			target.lastError = err
+			target.tryAfter, target.tryInterval = tryAfter(target.tryInterval)
 		}
 		return true
 	}
@@ -141,13 +141,13 @@ func (status ConnectionMakerStatus) String() string {
 	fmt.Fprintln(&buf, "Reconnects:")
 	for address, target := range status.Reconnects {
 		fmt.Fprintf(&buf, "->[%s]", address)
-		if target.LastError != nil {
-			fmt.Fprintf(&buf, " (%s)", target.LastError)
+		if target.lastError != nil {
+			fmt.Fprintf(&buf, " (%s)", target.lastError)
 		}
-		if target.Attempting {
-			fmt.Fprintf(&buf, " trying since %v\n", target.TryAfter)
+		if target.attempting {
+			fmt.Fprintf(&buf, " trying since %v\n", target.tryAfter)
 		} else {
-			fmt.Fprintf(&buf, " next try at %v\n", target.TryAfter)
+			fmt.Fprintf(&buf, " next try at %v\n", target.tryAfter)
 		}
 	}
 	return buf.String()
@@ -187,7 +187,7 @@ func (cm *ConnectionMaker) checkStateAndAttemptConnections() time.Duration {
 			return
 		}
 		target := &Target{}
-		target.TryAfter, target.TryInterval = tryImmediately()
+		target.tryAfter, target.tryInterval = tryImmediately()
 		cm.targets[address] = target
 	}
 
@@ -272,16 +272,16 @@ func (cm *ConnectionMaker) connectToTargets(validTarget map[string]struct{}, dir
 	now := time.Now() // make sure we catch items just added
 	after := MaxDuration
 	for address, target := range cm.targets {
-		if target.Attempting {
+		if target.attempting {
 			continue
 		}
 		if _, valid := validTarget[address]; !valid {
 			delete(cm.targets, address)
 			continue
 		}
-		switch duration := target.TryAfter.Sub(now); {
+		switch duration := target.tryAfter.Sub(now); {
 		case duration <= 0:
-			target.Attempting = true
+			target.attempting = true
 			_, isCmdLineTarget := directTarget[address]
 			go cm.attemptConnection(address, isCmdLineTarget)
 		case duration < after:
diff --git a/router/json.go b/router/json.go
index 1af7a50d..786e0d36 100644
--- a/router/json.go
+++ b/router/json.go
@@ -96,3 +96,20 @@ func (conn *RemoteConnection) MarshalJSON() ([]byte, error) {
 func (name PeerName) MarshalJSON() ([]byte, error) {
 	return json.Marshal(name.String())
 }
+
+func (target Target) MarshalJSON() ([]byte, error) {
+	t := struct {
+		Attempting  bool      `json:"Attempting,omitempty"`
+		TryAfter    time.Time `json:"TryAfter,omitempty"`
+		TryInterval string    `json:"TryInterval,omitempty"`
+		LastError   string    `json:"LastError,omitempty"`
+	}{
+		Attempting:  target.attempting,
+		TryAfter:    target.tryAfter,
+		TryInterval: target.tryInterval.String(),
+	}
+	if target.lastError != nil {
+		t.LastError = target.lastError.Error()
+	}
+	return json.Marshal(t)
+}