Browse Source

mempool/rpc: log grooming (#6201)

callum/e2e-timeout
Aleksandr Bezobchuk 3 years ago
committed by GitHub
parent
commit
be88fd3e63
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 7 deletions
  1. +2
    -2
      mempool/reactor.go
  2. +3
    -1
      rpc/jsonrpc/server/http_json_handler.go
  3. +5
    -3
      rpc/jsonrpc/server/http_server.go
  4. +5
    -1
      test/e2e/runner/rpc.go

+ 2
- 2
mempool/reactor.go View File

@ -180,7 +180,7 @@ func (r *Reactor) handleMempoolMessage(envelope p2p.Envelope) error {
for _, tx := range protoTxs {
if err := r.mempool.CheckTx(types.Tx(tx), nil, txInfo); err != nil {
logger.Error("checktx failed for tx", "tx", txID(tx), "err", err)
logger.Error("checktx failed for tx", "tx", fmt.Sprintf("%X", txID(tx)), "err", err)
}
}
@ -376,7 +376,7 @@ func (r *Reactor) broadcastTxRoutine(peerID p2p.NodeID, closer *tmsync.Closer) {
Txs: [][]byte{memTx.tx},
},
}
r.Logger.Debug("gossiped tx to peer", "tx", txID(memTx.tx), "peer", peerID)
r.Logger.Debug("gossiped tx to peer", "tx", fmt.Sprintf("%X", txID(memTx.tx)), "peer", peerID)
}
select {


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

@ -97,8 +97,9 @@ 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)
result, err := unreflectResult(returns)
switch e := err.(type) {
// if no error then return a success response
@ -122,6 +123,7 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
}
}
}
if len(responses) > 0 {
WriteRPCResponseHTTP(w, responses...)
}


+ 5
- 3
rpc/jsonrpc/server/http_server.go View File

@ -221,9 +221,11 @@ func RecoverAndLogHandler(handler http.Handler, logger log.Logger) http.Handler
if rww.Status == -1 {
rww.Status = 200
}
logger.Info("Served RPC HTTP response",
"method", r.Method, "url", r.URL,
"status", rww.Status, "duration", durationMS,
logger.Debug("served RPC HTTP response",
"method", r.Method,
"url", r.URL,
"status", rww.Status,
"duration", durationMS,
"remoteAddr", r.RemoteAddr,
)
}()


+ 5
- 1
test/e2e/runner/rpc.go View File

@ -92,18 +92,22 @@ func waitForNode(node *e2e.Node, height int64, timeout time.Duration) (*rpctypes
// waitForAllNodes waits for all nodes to become available and catch up to the given block height.
func waitForAllNodes(testnet *e2e.Testnet, height int64, timeout time.Duration) (int64, error) {
lastHeight := int64(0)
var lastHeight int64
for _, node := range testnet.Nodes {
if node.Mode == e2e.ModeSeed {
continue
}
status, err := waitForNode(node, height, timeout)
if err != nil {
return 0, err
}
if status.SyncInfo.LatestBlockHeight > lastHeight {
lastHeight = status.SyncInfo.LatestBlockHeight
}
}
return lastHeight, nil
}

Loading…
Cancel
Save