Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop

2015-02-17 16:09:25 +01:00 · 2015-02-17 16:09:25 +01:00 · 815ead7107
commit 815ead7107
parent 547788b1b0 417f018498
1 changed files with 4 additions and 2 deletions
--- a/logger/types.go
+++ b/logger/types.go
@ -44,8 +44,10 @@ func (l *P2PConnecting) EventName() string {
 }

 type P2PConnected struct {
-	NumConnections int    `json:"num_connections"`
-	RemoteId       string `json:"remote_id"`
+	RemoteId            string `json:"remote_id"`
+	RemoteAddress       string `json:"remote_addr"`
+	RemoteVersionString string `json:"remote_version_string"`
+	NumConnections      int    `json:"num_connections"`
 	LogEvent
 }