diff options
| author | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-06-30 08:22:19 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <geffobscura@gmail.com> | 2015-06-30 08:22:19 +0800 |
| commit | 7625b07dd9a2a7b5c5a504c1276eea04596ac871 (patch) | |
| tree | ce2a757cd4e0591fc15815b2dfae528ae517d36e /cmd/geth/main.go | |
| parent | 72e2613a9fe3205fa5a67b72b832e03b2357ee88 (diff) | |
| parent | 8f504063f465e0ca10c6bb53ee914d10a3d45c86 (diff) | |
| download | dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar.gz dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar.bz2 dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar.lz dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar.xz dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.tar.zst dexon-7625b07dd9a2a7b5c5a504c1276eea04596ac871.zip | |
Merge branch 'release/0.9.34'
Diffstat (limited to 'cmd/geth/main.go')
| -rw-r--r-- | cmd/geth/main.go | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/cmd/geth/main.go b/cmd/geth/main.go index 5a0f523a6..f4d2f94fe 100644 --- a/cmd/geth/main.go +++ b/cmd/geth/main.go @@ -30,6 +30,7 @@ import ( "runtime" "strconv" "strings" + "time" "github.com/codegangsta/cli" "github.com/ethereum/ethash" @@ -38,6 +39,7 @@ import ( "github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/eth" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/metrics" "github.com/ethereum/go-ethereum/rpc/codec" "github.com/ethereum/go-ethereum/rpc/comms" "github.com/mattn/go-colorable" @@ -46,7 +48,7 @@ import ( const ( ClientIdentifier = "Geth" - Version = "0.9.32" + Version = "0.9.34" ) var ( @@ -72,6 +74,7 @@ func init() { upgradedbCommand, removedbCommand, dumpCommand, + monitorCommand, { Action: makedag, Name: "makedag", @@ -269,6 +272,7 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso utils.LogJSONFlag, utils.PProfEanbledFlag, utils.PProfPortFlag, + utils.MetricsEnabledFlag, utils.SolcPathFlag, utils.GpoMinGasPriceFlag, utils.GpoMaxGasPriceFlag, @@ -284,6 +288,8 @@ JavaScript API. See https://github.com/ethereum/go-ethereum/wiki/Javascipt-Conso } return nil } + // Start system runtime metrics collection + go metrics.CollectProcessMetrics(3 * time.Second) } func main() { |