diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-14 20:53:55 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-14 20:53:55 +0800 |
| commit | 50fdfb127ac35120315628a286f0a507c4470a89 (patch) | |
| tree | 0b7a995ce2c5b439dae03f1e264823f2404e794a /ethereum/ethereum.go | |
| parent | 72df038d25c50a27adae8ea528dcedd3537267cf (diff) | |
| parent | 1d300bbc108f9d404d2eb5cbc8990042c0129f04 (diff) | |
| download | dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.gz dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.bz2 dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.lz dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.xz dexon-50fdfb127ac35120315628a286f0a507c4470a89.tar.zst dexon-50fdfb127ac35120315628a286f0a507c4470a89.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereum/ethereum.go')
| -rw-r--r-- | ethereum/ethereum.go | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ethereum/ethereum.go b/ethereum/ethereum.go index 34bacb7b9..179a3f462 100644 --- a/ethereum/ethereum.go +++ b/ethereum/ethereum.go @@ -6,10 +6,12 @@ import ( "github.com/ethereum/eth-go/ethchain" "github.com/ethereum/eth-go/ethutil" "github.com/ethereum/go-ethereum/utils" + "github.com/rakyll/globalconf" "io/ioutil" "log" "os" "os/signal" + "path" "runtime" "strings" ) @@ -59,7 +61,15 @@ func main() { lt = ethutil.LogFile | ethutil.LogStd } - ethutil.ReadConfig(DataDir, lt, Identifier) + g, err := globalconf.NewWithOptions(&globalconf.Options{ + Filename: path.Join(ethutil.ApplicationFolder(Datadir), "conf.ini"), + }) + if err != nil { + fmt.Println(err) + } else { + g.ParseAll() + } + ethutil.ReadConfig(Datadir, lt, g, Identifier) logger := ethutil.Config.Log |