Merge pull request #472 from bboreham/master

Add peer nickname to JSON status
weaveworks · Mar 19, 2015 · 39e7871 · 39e7871
2 parents 6b64516 + 3fbb6ea
commit 39e7871
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/router/json.go b/router/json.go
@@ -63,10 +63,11 @@ func (routes *Routes) MarshalJSON() ([]byte, error) {
 func (peer *Peer) MarshalJSON() ([]byte, error) {
 	return json.Marshal(struct {
 		Name        string
+		Nickname    string
 		UID         uint64
 		Version     uint64
 		Connections []Connection
-	}{peer.Name.String(), peer.UID, peer.version, peer.Connections()})
+	}{peer.Name.String(), peer.NickName, peer.UID, peer.version, peer.Connections()})
 }
 
 func (conn *RemoteConnection) MarshalJSON() ([]byte, error) {