forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-17 09:23:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

rebase

Browse source
This commit is contained in:
Pető Zoltán 2017-11-27 22:51:09 +01:00
commit 1aaeb78517
3 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
cmd/utils/flags.go
View file

@ -184,6 +184,7 @@ var (
Name: "lightkdf", Name: "lightkdf",
Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength", Usage: "Reduce key-derivation RAM & CPU usage at some expense of KDF strength",
} }
<<<<<<< HEAD
// Dashboard settings // Dashboard settings
DashboardEnabledFlag = cli.BoolFlag{ DashboardEnabledFlag = cli.BoolFlag{
Name: "dashboard", Name: "dashboard",
@ -209,6 +210,8 @@ var (
Usage: "Developer flag to serve the dashboard from the local file system", Usage: "Developer flag to serve the dashboard from the local file system",
Value: dashboard.DefaultConfig.Assets, Value: dashboard.DefaultConfig.Assets,
} }
=======
>>>>>>> f35c77a0584a4ab4d2d31ee8769406c6ad14bcfe
LightServStatsFlag = cli.BoolFlag{ LightServStatsFlag = cli.BoolFlag{
Name: "lightservstats", Name: "lightservstats",
Usage: "Enables LES server to put data to influxdb database", Usage: "Enables LES server to put data to influxdb database",

3
les/handler.go
View file

@ -1073,6 +1073,9 @@ func (pm *ProtocolManager) handleMsg(p *peer) error {
} }
bv, rcost := p.fcClient.RequestProcessed(costs.baseCost + uint64(reqCnt)*costs.reqCost) bv, rcost := p.fcClient.RequestProcessed(costs.baseCost + uint64(reqCnt)*costs.reqCost)
pm.server.fcCostStats.update(msg.Code, uint64(reqCnt), rcost) 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)) return p.SendTxStatus(req.ReqID, bv, pm.txStatus(req.Hashes))

4
les/server.go
View file

@ -45,9 +45,13 @@ type LesServer struct {
lesTopics []discv5.Topic lesTopics []discv5.Topic
privateKey *ecdsa.PrivateKey privateKey *ecdsa.PrivateKey
quitSync chan struct{} quitSync chan struct{}
<<<<<<< HEAD
chtIndexer, bloomTrieIndexer *core.ChainIndexer chtIndexer, bloomTrieIndexer *core.ChainIndexer
influxDBLogger *influxLogger influxDBLogger *influxLogger
=======
influxDBLogger *influxLogger
>>>>>>> f35c77a0584a4ab4d2d31ee8769406c6ad14bcfe
} }
func NewLesServer(eth *eth.Ethereum, config *eth.Config) (*LesServer, error) { func NewLesServer(eth *eth.Ethereum, config *eth.Config) (*LesServer, error) {