Skip to content

G
Geth-Modification
Commit 55d85d60 authored by obscuren's avatar obscuren
Browse files
Options

eth, cmd/geth: start mining from console respects CLI flag

parent d3e84cc8
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 1 deletion
cmd/geth/admin.go
View file @ 55d85d60
...@@ -288,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value { ...@@ -288,7 +288,7 @@ func (js *jsre) startMining(call otto.FunctionCall) otto.Value {
return otto.FalseValue() return otto.FalseValue()
} }
} else { } else {
threads = 4 threads = int64(js.ethereum.MinerThreads)
} }
err = js.ethereum.StartMining(int(threads)) err = js.ethereum.StartMining(int(threads))
......
eth/backend.go
View file @ 55d85d60
...@@ -190,6 +190,7 @@ type Ethereum struct { ...@@ -190,6 +190,7 @@ type Ethereum struct {
// logger logger.LogSystem // logger logger.LogSystem
Mining bool Mining bool
MinerThreads int
NatSpec bool NatSpec bool
DataDir string DataDir string
etherbase common.Address etherbase common.Address
...@@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) { ...@@ -262,6 +263,7 @@ func New(config *Config) (*Ethereum, error) {
ethVersionId: config.ProtocolVersion, ethVersionId: config.ProtocolVersion,
netVersionId: config.NetworkId, netVersionId: config.NetworkId,
NatSpec: config.NatSpec, NatSpec: config.NatSpec,
MinerThreads: config.MinerThreads,
} }
eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux()) eth.chainManager = core.NewChainManager(blockDb, stateDb, eth.EventMux())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment