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

815ead71 · obscuren · 547788b1 · 417f0184 · 815ead71
Commit 815ead71 authored Feb 17, 2015 by obscuren
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

types.go logger/types.go +4 -2

No files found.
--- 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
 }