diff options
| author | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-05-24 01:25:49 +0800 |
| commit | 72df038d25c50a27adae8ea528dcedd3537267cf (patch) | |
| tree | 44b358714448d492dcf8cdcddb4d1e6e57c4318b /ethereum/ethereum.go | |
| parent | 7f1a4c377c18055137909521d809251248b7b5af (diff) | |
| parent | d35380c19e5ce92b57158e7780f7105dc4136916 (diff) | |
| download | dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.gz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.bz2 dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.lz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.xz dexon-72df038d25c50a27adae8ea528dcedd3537267cf.tar.zst dexon-72df038d25c50a27adae8ea528dcedd3537267cf.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
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 != "" { |