Skip to content

Commit 988391f

Browse files
obscurenobscuren
committed
Merge pull request #409 from tgerring/jsonlogs
Updated JSON log events
2 parents b1603f1 + a75af47 commit 988391f

File tree

7 files changed

+40
-24
lines changed

7 files changed

+40
-24
lines changed

‎eth/backend.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/ethereum/go-ethereum/ethdb"
1313
"github.com/ethereum/go-ethereum/ethutil"
1414
"github.com/ethereum/go-ethereum/event"
15-
ethlogger "github.com/ethereum/go-ethereum/logger"
15+
"github.com/ethereum/go-ethereum/logger"
1616
"github.com/ethereum/go-ethereum/miner"
1717
"github.com/ethereum/go-ethereum/p2p"
1818
"github.com/ethereum/go-ethereum/p2p/discover"
@@ -23,8 +23,8 @@ import (
2323
)
2424

2525
var (
26-
logger = ethlogger.NewLogger("SERV")
27-
jsonlogger = ethlogger.NewJsonLogger()
26+
ethlogger = logger.NewLogger("SERV")
27+
jsonlogger = logger.NewJsonLogger()
2828

2929
defaultBootNodes = []*discover.Node{
3030
// ETH/DEV cmd/bootnode
@@ -74,7 +74,7 @@ func (cfg *Config) parseBootNodes() []*discover.Node {
7474
}
7575
n, err := discover.ParseNode(url)
7676
if err != nil {
77-
logger.Errorf("Bootstrap URL %s: %v\n", url, err)
77+
ethlogger.Errorf("Bootstrap URL %s: %v\n", url, err)
7878
continue
7979
}
8080
ns = append(ns, n)
@@ -98,7 +98,7 @@ func (cfg *Config) nodeKey() (*ecdsa.PrivateKey, error) {
9898
return nil, fmt.Errorf("could not generate server key: %v", err)
9999
}
100100
if err := ioutil.WriteFile(keyfile, crypto.FromECDSA(key), 0600); err != nil {
101-
logger.Errorln("could not persist nodekey: ", err)
101+
ethlogger.Errorln("could not persist nodekey: ", err)
102102
}
103103
return key, nil
104104
}
@@ -129,14 +129,14 @@ type Ethereum struct {
129129
RpcServer rpc.RpcServer
130130
keyManager *crypto.KeyManager
131131

132-
logger ethlogger.LogSystem
132+
logger logger.LogSystem
133133

134134
Mining bool
135135
}
136136

137137
func New(config *Config) (*Ethereum, error) {
138138
// Boostrap database
139-
logger := ethlogger.New(config.DataDir, config.LogFile, config.LogLevel, config.LogFormat)
139+
ethlogger := logger.New(config.DataDir, config.LogFile, config.LogLevel, config.LogFormat)
140140
db, err := ethdb.NewLDBDatabase("blockchain")
141141
if err != nil {
142142
return nil, err
@@ -173,7 +173,7 @@ func New(config *Config) (*Ethereum, error) {
173173
keyManager: keyManager,
174174
blacklist: p2p.NewBlacklist(),
175175
eventMux: &event.TypeMux{},
176-
logger: logger,
176+
logger: ethlogger,
177177
}
178178

179179
eth.chainManager = core.NewChainManager(db, eth.EventMux())
@@ -215,7 +215,7 @@ func New(config *Config) (*Ethereum, error) {
215215
}
216216

217217
func (s *Ethereum) KeyManager() *crypto.KeyManager { return s.keyManager }
218-
func (s *Ethereum) Logger() ethlogger.LogSystem { return s.logger }
218+
func (s *Ethereum) Logger() logger.LogSystem { return s.logger }
219219
func (s *Ethereum) Name() string { return s.net.Name }
220220
func (s *Ethereum) ChainManager() *core.ChainManager { return s.chainManager }
221221
func (s *Ethereum) BlockProcessor() *core.BlockProcessor { return s.blockProcessor }
@@ -233,7 +233,7 @@ func (s *Ethereum) Coinbase() []byte { return nil } // TODO
233233

234234
// Start the ethereum
235235
func (s *Ethereum) Start() error {
236-
jsonlogger.LogJson(&ethlogger.LogStarting{
236+
jsonlogger.LogJson(&logger.LogStarting{
237237
ClientString: s.net.Name,
238238
ProtocolVersion: ProtocolVersion,
239239
})
@@ -259,7 +259,7 @@ func (s *Ethereum) Start() error {
259259
s.blockSub = s.eventMux.Subscribe(core.NewMinedBlockEvent{})
260260
go s.blockBroadcastLoop()
261261

262-
logger.Infoln("Server started")
262+
ethlogger.Infoln("Server started")
263263
return nil
264264
}
265265

@@ -292,7 +292,7 @@ func (s *Ethereum) Stop() {
292292
s.whisper.Stop()
293293
}
294294

295-
logger.Infoln("Server stopped")
295+
ethlogger.Infoln("Server stopped")
296296
close(s.shutdownChan)
297297
}
298298

‎eth/block_pool.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ import (
1212

1313
"github.com/ethereum/go-ethereum/core/types"
1414
"github.com/ethereum/go-ethereum/ethutil"
15-
ethlogger "github.com/ethereum/go-ethereum/logger"
15+
"github.com/ethereum/go-ethereum/logger"
1616
"github.com/ethereum/go-ethereum/pow"
1717
)
1818

19-
var poolLogger = ethlogger.NewLogger("Blockpool")
19+
var poolLogger = logger.NewLogger("Blockpool")
2020

2121
const (
2222
blockHashesBatchSize = 256

‎eth/block_pool_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,19 +12,19 @@ import (
1212
"github.com/ethereum/go-ethereum/core/types"
1313
"github.com/ethereum/go-ethereum/crypto"
1414
"github.com/ethereum/go-ethereum/ethutil"
15-
ethlogger "github.com/ethereum/go-ethereum/logger"
15+
"github.com/ethereum/go-ethereum/logger"
1616
"github.com/ethereum/go-ethereum/pow"
1717
)
1818

1919
const waitTimeout = 60 // seconds
2020

21-
var logsys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugDetailLevel))
21+
var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel))
2222

2323
var ini = false
2424

2525
func logInit() {
2626
if !ini {
27-
ethlogger.AddLogSystem(logsys)
27+
logger.AddLogSystem(logsys)
2828
ini = true
2929
}
3030
}

‎eth/protocol.go‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import (
88

99
"github.com/ethereum/go-ethereum/core/types"
1010
"github.com/ethereum/go-ethereum/ethutil"
11+
"github.com/ethereum/go-ethereum/logger"
1112
"github.com/ethereum/go-ethereum/p2p"
1213
"github.com/ethereum/go-ethereum/rlp"
1314
)
@@ -137,6 +138,12 @@ func (self *ethProtocol) handle() error {
137138
if err := msg.Decode(&txs); err != nil {
138139
return self.protoError(ErrDecode, "msg %v: %v", msg, err)
139140
}
141+
for _, tx := range txs {
142+
jsonlogger.LogJson(&logger.EthTxReceived{
143+
TxHash: ethutil.Bytes2Hex(tx.Hash()),
144+
RemoteId: self.peer.ID().String(),
145+
})
146+
}
140147
self.txPool.AddTransactions(txs)
141148

142149
case GetBlockHashesMsg:

‎eth/protocol_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import (
1212
"github.com/ethereum/go-ethereum/core/types"
1313
"github.com/ethereum/go-ethereum/crypto"
1414
"github.com/ethereum/go-ethereum/ethutil"
15-
ethlogger "github.com/ethereum/go-ethereum/logger"
15+
"github.com/ethereum/go-ethereum/logger"
1616
"github.com/ethereum/go-ethereum/p2p"
1717
"github.com/ethereum/go-ethereum/p2p/discover"
1818
)
1919

20-
var sys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugDetailLevel))
20+
var sys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel))
2121

2222
type testMsgReadWriter struct {
2323
in chan p2p.Msg

‎logger/types.go‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package logger
22

33
import (
4+
"math/big"
45
"time"
56
)
67

@@ -53,10 +54,10 @@ func (l *P2PDisconnected) EventName() string {
5354
}
5455

5556
type EthMinerNewBlock struct {
56-
BlockHash string `json:"block_hash"`
57-
BlockNumber int `json:"block_number"`
58-
ChainHeadHash string `json:"chain_head_hash"`
59-
BlockPrevHash string `json:"block_prev_hash"`
57+
BlockHash string `json:"block_hash"`
58+
BlockNumber *big.Int `json:"block_number"`
59+
ChainHeadHash string `json:"chain_head_hash"`
60+
BlockPrevHash string `json:"block_prev_hash"`
6061
LogEvent
6162
}
6263

‎miner/worker.go‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,14 @@ import (
1111
"github.com/ethereum/go-ethereum/core/types"
1212
"github.com/ethereum/go-ethereum/ethutil"
1313
"github.com/ethereum/go-ethereum/event"
14+
"github.com/ethereum/go-ethereum/logger"
1415
"github.com/ethereum/go-ethereum/pow"
1516
"github.com/ethereum/go-ethereum/state"
1617
"gopkg.in/fatih/set.v0"
1718
)
1819

20+
var jsonlogger = logger.NewJsonLogger()
21+
1922
type environment struct {
2023
totalUsedGas *big.Int
2124
state *state.StateDB
@@ -146,7 +149,12 @@ func (self *worker) wait() {
146149
block := self.current.block
147150
if block.Number().Uint64() == work.Number && block.Nonce() == nil {
148151
self.current.block.Header().Nonce = work.Nonce
149-
152+
jsonlogger.LogJson(&logger.EthMinerNewBlock{
153+
BlockHash: ethutil.Bytes2Hex(block.Hash()),
154+
BlockNumber: block.Number(),
155+
ChainHeadHash: ethutil.Bytes2Hex(block.ParentHeaderHash),
156+
BlockPrevHash: ethutil.Bytes2Hex(block.ParentHeaderHash),
157+
})
150158
if err := self.chain.InsertChain(types.Blocks{self.current.block}); err == nil {
151159
self.mux.Post(core.NewMinedBlockEvent{self.current.block})
152160
} else {

0 commit comments

Comments
 (0)