diff options
| author | Maran <maran.hidskes@gmail.com> | 2014-05-23 16:29:17 +0800 |
|---|---|---|
| committer | Maran <maran.hidskes@gmail.com> | 2014-05-23 16:29:17 +0800 |
| commit | 36683f2e2957c262b17e71b15ecdb04d2feda0f5 (patch) | |
| tree | c385d96d4b92708ac26364864a28a0639d2c1f53 /ethereum/ethereum.go | |
| parent | 6b115659ca3f5879f27c45723ef567b67133bc93 (diff) | |
| parent | 5f8911f7cba2cf837d891735f46b02b34e4fc228 (diff) | |
| download | dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.gz dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.bz2 dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.lz dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.xz dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.tar.zst dexon-36683f2e2957c262b17e71b15ecdb04d2feda0f5.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 != "" { |