aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum/main.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-07-17 21:32:44 +0800
committerobscuren <geffobscura@gmail.com>2014-07-17 21:32:44 +0800
commitc9517024237de781cdc450bca89907217e5a8cef (patch)
tree9ed398ca6ddbc019917b96a6e14988d89fbef15a /ethereum/main.go
parentfc8bd7229ee25e214130df98875ecc13e4650911 (diff)
parent7d64b589b4cf3f71125d5bd0f0a8f6a560e909db (diff)
downloadgo-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.gz
go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.tar.zst
go-tangerine-c9517024237de781cdc450bca89907217e5a8cef.zip
Merge branch 'develop'0.5.17
Diffstat (limited to 'ethereum/main.go')
-rw-r--r--ethereum/main.go9
1 files changed, 9 insertions, 0 deletions
diff --git a/ethereum/main.go b/ethereum/main.go
index e4d73d494..fd4a89aa9 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,15 @@ 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
+ ethutil.Config.DiffType = DiffType
utils.InitDataDir(Datadir)