mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-17 01:13:45 +00:00
merge conflicts fix
This commit is contained in:
commit
c2f048184f
1 changed files with 3 additions and 0 deletions
|
|
@ -1073,6 +1073,9 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
|
|||
}
|
||||
bv, rcost := p.fcClient.RequestProcessed(costs.baseCost + uint64(reqCnt)*costs.reqCost)
|
||||
pm.server.fcCostStats.update(msg.Code, uint64(reqCnt), rcost)
|
||||
if pm.server.influxDBLogger != nil {
|
||||
pm.server.influxDBLogger.WriteData(msg.Code, uint64(reqCnt), rcost, mclock.Now(), p.id)
|
||||
}
|
||||
|
||||
return p.SendTxStatus(req.ReqID, bv, pm.txStatus(req.Hashes))
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue