From a047a4a70f0776ca21e057e87a4f49776b29afa9 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Thu, 4 Mar 2021 10:42:19 +0000 Subject: [PATCH] logs: cleanup (#6198) Co-authored-by: Marko --- consensus/state.go | 11 +++++------ mempool/clist_mempool.go | 10 +++++----- rpc/jsonrpc/server/http_json_handler.go | 2 +- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/consensus/state.go b/consensus/state.go index 77eb500ae..c5b50d49e 100644 --- a/consensus/state.go +++ b/consensus/state.go @@ -1140,8 +1140,7 @@ func (cs *State) defaultDecideProposal(height int64, round int32) { 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 { 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 { logger.Error("failed to prune blocks", "retain_height", retainHeight, "err", err) } 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 cs.evpool.ReportConflictingVotes(voteErr.VoteA, voteErr.VoteB) - cs.Logger.Info( + cs.Logger.Debug( "found and sent conflicting votes to the evidence pool", "vote_a", voteErr.VoteA, "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: 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() if ok { @@ -2220,7 +2219,7 @@ func (cs *State) signAddVote(msgType tmproto.SignedMsgType, hash []byte, header vote, err := cs.signVote(msgType, hash, header) if err == nil { 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 } diff --git a/mempool/clist_mempool.go b/mempool/clist_mempool.go index a82dfd181..3b3709588 100644 --- a/mempool/clist_mempool.go +++ b/mempool/clist_mempool.go @@ -427,7 +427,7 @@ func (mem *CListMempool) resCbFirstTime( } memTx.senders.Store(peerID, true) mem.addTx(memTx) - mem.logger.Info("Added good transaction", + mem.logger.Debug("added good transaction", "tx", txID(tx), "res", r, "height", memTx.height, @@ -436,7 +436,7 @@ func (mem *CListMempool) resCbFirstTime( mem.notifyTxsAvailable() } else { // ignore bad transaction - mem.logger.Info("Rejected bad transaction", + mem.logger.Debug("rejected bad transaction", "tx", txID(tx), "peerID", peerP2PID, "res", r, "err", postCheckErr) mem.metrics.FailedTxs.Add(1) if !mem.config.KeepInvalidTxsInCache { @@ -472,7 +472,7 @@ func (mem *CListMempool) resCbRecheck(req *abci.Request, res *abci.Response) { // Good, nothing to do. } else { // 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 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 { // Done! - mem.logger.Info("Done rechecking txs") + mem.logger.Debug("done rechecking txs") // incase the recheck removed all txs if mem.Size() > 0 { @@ -612,7 +612,7 @@ func (mem *CListMempool) Update( // or just notify there're some txs left. if mem.Size() > 0 { 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() // At this point, mem.txs are being rechecked. // mem.recheckCursor re-scans mem.txs and possibly removes some txs. diff --git a/rpc/jsonrpc/server/http_json_handler.go b/rpc/jsonrpc/server/http_json_handler.go index ffe9d133b..fd39a45c8 100644 --- a/rpc/jsonrpc/server/http_json_handler.go +++ b/rpc/jsonrpc/server/http_json_handler.go @@ -98,7 +98,7 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han args = append(args, fnArgs...) } 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) if err != nil { responses = append(responses, types.RPCInternalError(request.ID, err))