merge conflicts fix

This commit is contained in:
Pető Zoltán 2017-12-07 12:23:31 +01:00
commit c2f048184f

View file

@ -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))