Browse Source

mempool/rpc: log grooming (bp #6201) (#6203)

pull/6216/head
mergify[bot] 4 years ago
committed by GitHub
parent
commit
1b5697a41d
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 13 additions and 6 deletions
  1. +2
    -1
      rpc/jsonrpc/server/http_json_handler.go
  2. +5
    -3
      rpc/jsonrpc/server/http_server.go
  3. +6
    -2
      test/e2e/runner/rpc.go

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

@ -97,8 +97,8 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
}
args = append(args, fnArgs...)
}
returns := rpcFunc.f.Call(args)
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))
@ -106,6 +106,7 @@ func makeJSONRPCHandler(funcMap map[string]*RPCFunc, logger log.Logger) http.Han
}
responses = append(responses, types.NewRPCSuccessResponse(request.ID, result))
}
if len(responses) > 0 {
WriteRPCResponseHTTP(w, responses...)
}


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

@ -197,9 +197,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,
)
}()


+ 6
- 2
test/e2e/runner/rpc.go View File

@ -90,18 +90,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, 20*time.Second)
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