Merge pull request #339 from tgerring/jsonlog

JSON log updates
ethereum · Feb 19, 2015 · 4322632 · 4322632
2 parents fdecc11 + 07bdba6
commit 4322632
Show file tree

Hide file tree

Showing 3 changed files with 296 additions and 300 deletions.
diff --git a/cmd/ethereum/main.go b/cmd/ethereum/main.go
@@ -67,6 +67,7 @@ func main() {
 		DataDir:   Datadir,
 		LogFile:   LogFile,
 		LogLevel:  LogLevel,
+		LogFormat: LogFormat,
 		MaxPeers:  MaxPeer,
 		Port:      OutboundPort,
 		NAT:       NAT,

diff --git a/eth/backend.go b/eth/backend.go
@@ -209,9 +209,7 @@ func (s *Ethereum) Coinbase() []byte                     { return nil } // TODO
 func (s *Ethereum) Start() error {
 	jsonlogger.LogJson(&ethlogger.LogStarting{
 		ClientString:    s.net.Name,
-		Coinbase:        ethutil.Bytes2Hex(s.KeyManager().Address()),
 		ProtocolVersion: ProtocolVersion,
-		LogEvent:        ethlogger.LogEvent{Guid: ethutil.Bytes2Hex(crypto.FromECDSAPub(&s.net.PrivateKey.PublicKey))},
 	})
 
 	err := s.net.Start()