Browse Source

logs: cleanup (#6198)

Co-authored-by: Marko <marbar3778@yahoo.com>
pull/6216/head
mergify[bot] 4 years ago
committed by GitHub
parent
commit
a047a4a70f
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 12 deletions
  1. +5
    -6
      consensus/state.go
  2. +5
    -5
      mempool/clist_mempool.go
  3. +1
    -1
      rpc/jsonrpc/server/http_json_handler.go

+ 5
- 6
consensus/state.go View File

@ -1140,8 +1140,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) {
cs.sendInternalMessage(msgInfo{&BlockPartMessage{cs.Height, cs.Round, part}, ""}) cs.sendInternalMessage(msgInfo{&BlockPartMessage{cs.Height, cs.Round, part}, ""})
} }
cs.Logger.Info("signed proposal", "height", height, "round", round, "proposal", proposal)
cs.Logger.Debug("signed proposal block", "block", block)
cs.Logger.Debug("signed proposal", "height", height, "round", round, "proposal", proposal)
} else if !cs.replayMode { } else if !cs.replayMode {
cs.Logger.Error("propose step; failed signing proposal", "height", height, "round", round, "err", err) cs.Logger.Error("propose step; failed signing proposal", "height", height, "round", round, "err", err)
} }
@ -1654,7 +1653,7 @@ func (cs *State) finalizeCommit(height int64) {
if err != nil { if err != nil {
logger.Error("failed to prune blocks", "retain_height", retainHeight, "err", err) logger.Error("failed to prune blocks", "retain_height", retainHeight, "err", err)
} else { } else {
logger.Info("pruned blocks", "pruned", pruned, "retain_height", retainHeight)
logger.Debug("pruned blocks", "pruned", pruned, "retain_height", retainHeight)
} }
} }
@ -1952,7 +1951,7 @@ func (cs *State) tryAddVote(vote *types.Vote, peerID p2p.ID) (bool, error) {
// report conflicting votes to the evidence pool // report conflicting votes to the evidence pool
cs.evpool.ReportConflictingVotes(voteErr.VoteA, voteErr.VoteB) cs.evpool.ReportConflictingVotes(voteErr.VoteA, voteErr.VoteB)
cs.Logger.Info(
cs.Logger.Debug(
"found and sent conflicting votes to the evidence pool", "found and sent conflicting votes to the evidence pool",
"vote_a", voteErr.VoteA, "vote_a", voteErr.VoteA,
"vote_b", voteErr.VoteB, "vote_b", voteErr.VoteB,
@ -2116,7 +2115,7 @@ func (cs *State) addVote(vote *types.Vote, peerID p2p.ID) (added bool, err error
case tmproto.PrecommitType: case tmproto.PrecommitType:
precommits := cs.Votes.Precommits(vote.Round) precommits := cs.Votes.Precommits(vote.Round)
cs.Logger.Info("added vote to precommit", "vote", vote, "precommits", precommits.StringShort())
cs.Logger.Debug("added vote to precommit", "vote", vote, "precommits", precommits.StringShort())
blockID, ok := precommits.TwoThirdsMajority() blockID, ok := precommits.TwoThirdsMajority()
if ok { if ok {
@ -2220,7 +2219,7 @@ func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header
vote, err := cs.signVote(msgType, hash, header) vote, err := cs.signVote(msgType, hash, header)
if err == nil { if err == nil {
cs.sendInternalMessage(msgInfo{&VoteMessage{vote}, ""}) cs.sendInternalMessage(msgInfo{&VoteMessage{vote}, ""})
cs.Logger.Info("signed and pushed vote", "height", cs.Height, "round", cs.Round, "vote", vote)
cs.Logger.Debug("signed and pushed vote", "height", cs.Height, "round", cs.Round, "vote", vote)
return vote return vote
} }


+ 5
- 5
mempool/clist_mempool.go View File

@ -427,7 +427,7 @@ func (mem *CListMempool) resCbFirstTime(
} }
memTx.senders.Store(peerID, true) memTx.senders.Store(peerID, true)
mem.addTx(memTx) mem.addTx(memTx)
mem.logger.Info("Added good transaction",
mem.logger.Debug("added good transaction",
"tx", txID(tx), "tx", txID(tx),
"res", r, "res", r,
"height", memTx.height, "height", memTx.height,
@ -436,7 +436,7 @@ func (mem *CListMempool) resCbFirstTime(
mem.notifyTxsAvailable() mem.notifyTxsAvailable()
} else { } else {
// ignore bad transaction // ignore bad transaction
mem.logger.Info("Rejected bad transaction",
mem.logger.Debug("rejected bad transaction",
"tx", txID(tx), "peerID", peerP2PID, "res", r, "err", postCheckErr) "tx", txID(tx), "peerID", peerP2PID, "res", r, "err", postCheckErr)
mem.metrics.FailedTxs.Add(1) mem.metrics.FailedTxs.Add(1)
if !mem.config.KeepInvalidTxsInCache { if !mem.config.KeepInvalidTxsInCache {
@ -472,7 +472,7 @@ func (mem *CListMempool) resCbRecheck(req *abci.Request, res *abci.Response) {
// Good, nothing to do. // Good, nothing to do.
} else { } else {
// Tx became invalidated due to newly committed block. // Tx became invalidated due to newly committed block.
mem.logger.Info("Tx is no longer valid", "tx", txID(tx), "res", r, "err", postCheckErr)
mem.logger.Debug("tx is no longer valid", "tx", txID(tx), "res", r, "err", postCheckErr)
// NOTE: we remove tx from the cache because it might be good later // NOTE: we remove tx from the cache because it might be good later
mem.removeTx(tx, mem.recheckCursor, !mem.config.KeepInvalidTxsInCache) mem.removeTx(tx, mem.recheckCursor, !mem.config.KeepInvalidTxsInCache)
} }
@ -483,7 +483,7 @@ func (mem *CListMempool) resCbRecheck(req *abci.Request, res *abci.Response) {
} }
if mem.recheckCursor == nil { if mem.recheckCursor == nil {
// Done! // Done!
mem.logger.Info("Done rechecking txs")
mem.logger.Debug("done rechecking txs")
// incase the recheck removed all txs // incase the recheck removed all txs
if mem.Size() > 0 { if mem.Size() > 0 {
@ -612,7 +612,7 @@ func (mem *CListMempool) Update(
// or just notify there're some txs left. // or just notify there're some txs left.
if mem.Size() > 0 { if mem.Size() > 0 {
if mem.config.Recheck { if mem.config.Recheck {
mem.logger.Info("Recheck txs", "numtxs", mem.Size(), "height", height)
mem.logger.Debug("recheck txs", "numtxs", mem.Size(), "height", height)
mem.recheckTxs() mem.recheckTxs()
// At this point, mem.txs are being rechecked. // At this point, mem.txs are being rechecked.
// mem.recheckCursor re-scans mem.txs and possibly removes some txs. // mem.recheckCursor re-scans mem.txs and possibly removes some txs.


+ 1
- 1
rpc/jsonrpc/server/http_json_handler.go View File

@ -98,7 +98,7 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
args = append(args, fnArgs...) args = append(args, fnArgs...)
} }
returns := rpcFunc.f.Call(args) returns := rpcFunc.f.Call(args)
logger.Info("HTTPJSONRPC", "method", request.Method, "args", args, "returns", returns)
logger.Debug("HTTPJSONRPC", "method", request.Method, "args", args, "returns", returns)
result, err := unreflectResult(returns) result, err := unreflectResult(returns)
if err != nil { if err != nil {
responses = append(responses, types.RPCInternalError(request.ID, err)) responses = append(responses, types.RPCInternalError(request.ID, err))


Loading…
Cancel
Save