diff options
| author | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-07-15 01:32:54 +0800 |
| commit | 353ecbb7d78d9669c42545f152f291f869b39c02 (patch) | |
| tree | f3cbb4ad253708b55001d658737578d9713dca52 /ethereum/main.go | |
| parent | 6b296d907b848e2a3dbc78ea5c04c3c3d719d9bd (diff) | |
| parent | e53acdc2ac45fa8953afc3392ed81653d6f26326 (diff) | |
| download | dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.gz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.bz2 dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.lz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.xz dexon-353ecbb7d78d9669c42545f152f291f869b39c02.tar.zst dexon-353ecbb7d78d9669c42545f152f291f869b39c02.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into feature/ethutil-refactor
Diffstat (limited to 'ethereum/main.go')
| -rw-r--r-- | ethereum/main.go | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ethereum/main.go b/ethereum/main.go index e4d73d494..39226c1d2 100644 --- a/ethereum/main.go +++ b/ethereum/main.go @@ -2,6 +2,7 @@ package main import ( "github.com/ethereum/eth-go/ethlog" + "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/utils" "runtime" ) @@ -20,7 +21,14 @@ func main() { // precedence: code-internal flag default < config file < environment variables < command line Init() // parsing command line + + // If the difftool option is selected ignore all other log output + if DiffTool { + LogLevel = 0 + } + utils.InitConfig(ConfigFile, Datadir, "ETH") + ethutil.Config.Diff = DiffTool utils.InitDataDir(Datadir) |