aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-04-05 19:05:10 +0800
committerobscuren <geffobscura@gmail.com>2015-04-05 19:05:10 +0800
commit50edd4243e6eda1e4058209d0222443091a1ac50 (patch)
treefe3483da4754bab642289a32b0d27dcb1b29fe5f
parentac473a8623c22ef9ffeaa9022e31cacf219f5110 (diff)
downloaddexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar.gz
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar.bz2
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar.lz
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar.xz
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.tar.zst
dexon-50edd4243e6eda1e4058209d0222443091a1ac50.zip
removed hash rate from info log. Added hashrate js func
-rw-r--r--cmd/geth/admin.go5
-rw-r--r--miner/worker.go2
2 files changed, 6 insertions, 1 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index f2887c6db..1515cd6ac 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -37,6 +37,11 @@ func (js *jsre) adminBindings() {
admin.Set("dumpBlock", js.dumpBlock)
admin.Set("verbosity", js.verbosity)
admin.Set("backtrace", js.backtrace)
+ admin.Set("hashrate", js.hashrate)
+}
+
+func (js *jsre) hashrate(otto.FunctionCall) otto.Value {
+ return js.re.ToVal(js.ethereum.Miner().HashRate())
}
func (js *jsre) backtrace(call otto.FunctionCall) otto.Value {
diff --git a/miner/worker.go b/miner/worker.go
index 8541100d1..17afa25de 100644
--- a/miner/worker.go
+++ b/miner/worker.go
@@ -145,7 +145,7 @@ out:
}
break out
case <-timer.C:
- if glog.V(logger.Info) {
+ if glog.V(logger.Debug) {
glog.Infoln("Hash rate:", self.HashRate(), "Khash")
}