diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-26 06:41:55 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-26 06:41:55 +0800 |
| commit | 0d89c1d212e121b4904bf24b5332de9d4344334b (patch) | |
| tree | b6499be349d9950ba083e211ebb787294fbf413c /ethereum/ethereum.go | |
| parent | 7f1a4c377c18055137909521d809251248b7b5af (diff) | |
| parent | 818bc84591c490b29cb28ee1e4895c8f303a0af1 (diff) | |
| download | go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar.gz go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar.bz2 go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar.lz go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar.xz go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.tar.zst go-tangerine-0d89c1d212e121b4904bf24b5332de9d4344334b.zip | |
Merge branch 'release/poc5-rc9'poc5-rc9
Diffstat (limited to 'ethereum/ethereum.go')
| -rw-r--r-- | ethereum/ethereum.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 2fdfd5caf..34bacb7b9 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -52,12 +52,15 @@ func main() { var logSys *log.Logger flags := log.LstdFlags + var lt ethutil.LoggerType if StartJsConsole || len(InputFile) > 0 { - ethutil.ReadConfig(DataDir, ethutil.LogFile) + lt = ethutil.LogFile } else { - ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd) + lt = ethutil.LogFile | ethutil.LogStd } + ethutil.ReadConfig(DataDir, lt, Identifier) + logger := ethutil.Config.Log if LogFile != "" { |