cerc-io/plugeth
18
0
Fork 1
Code Issues 4 Pull Requests Packages Projects Releases Wiki Activity

logger: remove Core verbosity level (#3659)

Browse Source
This commit is contained in:
Felix Lange 2017-02-15 10:14:44 +01:00 committed by Jeffrey Wilcke
parent a973d1d523
commit c8695fae35
8 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/database_util.go
View File

@ -294,7 +294,7 @@ func GetReceipt(db ethdb.Database, txHash common.Hash) *types.Receipt {
var receipt types.ReceiptForStorage var receipt types.ReceiptForStorage
err := rlp.DecodeBytes(data, &receipt) err := rlp.DecodeBytes(data, &receipt)
if err != nil { if err != nil {
glog.V(logger.Core).Infoln("GetReceipt err:", err) glog.V(logger.Debug).Infoln("GetReceipt err:", err)
} }
return (*types.Receipt)(&receipt) return (*types.Receipt)(&receipt)
} }

6
core/state/state_object.go
View File

@ -135,7 +135,7 @@ func (self *StateObject) markSuicided() {
self.onDirty(self.Address()) self.onDirty(self.Address())
self.onDirty = nil self.onDirty = nil
} }
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v X\n", self.Address(), self.Nonce(), self.Balance()) glog.Infof("%x: #%d %v X\n", self.Address(), self.Nonce(), self.Balance())
} }
} }
@ -253,7 +253,7 @@ func (c *StateObject) AddBalance(amount *big.Int) {
} }
c.SetBalance(new(big.Int).Add(c.Balance(), amount)) c.SetBalance(new(big.Int).Add(c.Balance(), amount))
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.Nonce(), c.Balance(), amount) glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.Nonce(), c.Balance(), amount)
} }
} }
@ -266,7 +266,7 @@ func (c *StateObject) SubBalance(amount *big.Int) {
} }
c.SetBalance(new(big.Int).Sub(c.Balance(), amount)) c.SetBalance(new(big.Int).Sub(c.Balance(), amount))
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.Nonce(), c.Balance(), amount) glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.Nonce(), c.Balance(), amount)
} }
} }

2
core/state/statedb.go
View File

@ -451,7 +451,7 @@ func (self *StateDB) createObject(addr common.Address) (newobj, prev *StateObjec
newobj = newObject(self, addr, Account{}, self.MarkStateObjectDirty) newobj = newObject(self, addr, Account{}, self.MarkStateObjectDirty)
newobj.setNonce(0) // sets the object to dirty newobj.setNonce(0) // sets the object to dirty
if prev == nil { if prev == nil {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("(+) %x\n", addr) glog.Infof("(+) %x\n", addr)
} }
self.journal = append(self.journal, createObjectChange{account: &addr}) self.journal = append(self.journal, createObjectChange{account: &addr})

2
core/state_transition.go
View File

@ -250,7 +250,7 @@ func (self *StateTransition) TransitionDb() (ret []byte, requiredGas, usedGas *b
ret, self.gas, vmerr = evm.Call(sender, self.to().Address(), self.data, self.gas, self.value) ret, self.gas, vmerr = evm.Call(sender, self.to().Address(), self.data, self.gas, self.value)
} }
if vmerr != nil { if vmerr != nil {
glog.V(logger.Core).Infoln("vm returned with error:", err) glog.V(logger.Debug).Infoln("vm returned with error:", err)
// The only possible consensus-error would be if there wasn't // The only possible consensus-error would be if there wasn't
// sufficient balance to make the transfer happen. The first // sufficient balance to make the transfer happen. The first
// balance transfer may never fail. // balance transfer may never fail.

14
core/tx_pool.go
View File

@ -514,7 +514,7 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) {
for addr, list := range pool.queue { for addr, list := range pool.queue {
// Drop all transactions that are deemed too old (low nonce) // Drop all transactions that are deemed too old (low nonce)
for _, tx := range list.Forward(state.GetNonce(addr)) { for _, tx := range list.Forward(state.GetNonce(addr)) {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Removed old queued transaction: %v", tx) glog.Infof("Removed old queued transaction: %v", tx)
} }
delete(pool.all, tx.Hash()) delete(pool.all, tx.Hash())
@ -522,7 +522,7 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) {
// Drop all transactions that are too costly (low balance) // Drop all transactions that are too costly (low balance)
drops, _ := list.Filter(state.GetBalance(addr)) drops, _ := list.Filter(state.GetBalance(addr))
for _, tx := range drops { for _, tx := range drops {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Removed unpayable queued transaction: %v", tx) glog.Infof("Removed unpayable queued transaction: %v", tx)
} }
delete(pool.all, tx.Hash()) delete(pool.all, tx.Hash())
@ -530,14 +530,14 @@ func (pool *TxPool) promoteExecutables(state *state.StateDB) {
} }
// Gather all executable transactions and promote them // Gather all executable transactions and promote them
for _, tx := range list.Ready(pool.pendingState.GetNonce(addr)) { for _, tx := range list.Ready(pool.pendingState.GetNonce(addr)) {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Promoting queued transaction: %v", tx) glog.Infof("Promoting queued transaction: %v", tx)
} }
pool.promoteTx(addr, tx.Hash(), tx) pool.promoteTx(addr, tx.Hash(), tx)
} }
// Drop all transactions over the allowed limit // Drop all transactions over the allowed limit
for _, tx := range list.Cap(int(maxQueuedPerAccount)) { for _, tx := range list.Cap(int(maxQueuedPerAccount)) {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Removed cap-exceeding queued transaction: %v", tx) glog.Infof("Removed cap-exceeding queued transaction: %v", tx)
} }
delete(pool.all, tx.Hash()) delete(pool.all, tx.Hash())
@ -651,7 +651,7 @@ func (pool *TxPool) demoteUnexecutables(state *state.StateDB) {
// Drop all transactions that are deemed too old (low nonce) // Drop all transactions that are deemed too old (low nonce)
for _, tx := range list.Forward(nonce) { for _, tx := range list.Forward(nonce) {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Removed old pending transaction: %v", tx) glog.Infof("Removed old pending transaction: %v", tx)
} }
delete(pool.all, tx.Hash()) delete(pool.all, tx.Hash())
@ -659,14 +659,14 @@ func (pool *TxPool) demoteUnexecutables(state *state.StateDB) {
// Drop all transactions that are too costly (low balance), and queue any invalids back for later // Drop all transactions that are too costly (low balance), and queue any invalids back for later
drops, invalids := list.Filter(state.GetBalance(addr)) drops, invalids := list.Filter(state.GetBalance(addr))
for _, tx := range drops { for _, tx := range drops {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Removed unpayable pending transaction: %v", tx) glog.Infof("Removed unpayable pending transaction: %v", tx)
} }
delete(pool.all, tx.Hash()) delete(pool.all, tx.Hash())
pendingNofundsCounter.Inc(1) pendingNofundsCounter.Inc(1)
} }
for _, tx := range invalids { for _, tx := range invalids {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("Demoting pending transaction: %v", tx) glog.Infof("Demoting pending transaction: %v", tx)
} }
pool.enqueueTx(tx.Hash(), tx) pool.enqueueTx(tx.Hash(), tx)

2
light/state.go
View File

@ -239,7 +239,7 @@ func (self *LightState) GetOrNewStateObject(ctx context.Context, addr common.Add
// newStateObject creates a state object whether it exists in the state or not // newStateObject creates a state object whether it exists in the state or not
func (self *LightState) newStateObject(addr common.Address) *StateObject { func (self *LightState) newStateObject(addr common.Address) *StateObject {
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("(+) %x\n", addr) glog.Infof("(+) %x\n", addr)
} }

6
light/state_object.go
View File

@ -109,7 +109,7 @@ func (self *StateObject) MarkForDeletion() {
self.remove = true self.remove = true
self.dirty = true self.dirty = true
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v X\n", self.Address(), self.nonce, self.balance) glog.Infof("%x: #%d %v X\n", self.Address(), self.nonce, self.balance)
} }
} }
@ -158,7 +158,7 @@ func (self *StateObject) SetState(k, value common.Hash) {
func (c *StateObject) AddBalance(amount *big.Int) { func (c *StateObject) AddBalance(amount *big.Int) {
c.SetBalance(new(big.Int).Add(c.balance, amount)) c.SetBalance(new(big.Int).Add(c.balance, amount))
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.nonce, c.balance, amount) glog.Infof("%x: #%d %v (+ %v)\n", c.Address(), c.nonce, c.balance, amount)
} }
} }
@ -167,7 +167,7 @@ func (c *StateObject) AddBalance(amount *big.Int) {
func (c *StateObject) SubBalance(amount *big.Int) { func (c *StateObject) SubBalance(amount *big.Int) {
c.SetBalance(new(big.Int).Sub(c.balance, amount)) c.SetBalance(new(big.Int).Sub(c.balance, amount))
if glog.V(logger.Core) { if glog.V(logger.Debug) {
glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.nonce, c.balance, amount) glog.Infof("%x: #%d %v (- %v)\n", c.Address(), c.nonce, c.balance, amount)
} }
} }

1
logger/verbosity.go
View File

@ -20,7 +20,6 @@ const (
Error = iota + 1 Error = iota + 1
Warn Warn
Info Info
Core
Debug Debug
Detail Detail