diff options
| author | obscuren <geffobscura@gmail.com> | 2014-05-31 01:36:21 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-05-31 01:36:21 +0800 |
| commit | 4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b (patch) | |
| tree | 698d0741de1bc01510bbb98fdb42baa8aef690d1 /ethereum | |
| parent | 5f28013f7937cf2264ec646bdc04bc55f26bad77 (diff) | |
| parent | 0bdb0a9d58be08e210eb94dc6893f6103202ae7c (diff) | |
| download | dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar.gz dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar.bz2 dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar.lz dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar.xz dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.tar.zst dexon-4dfce5d347715e58ec6f2b291eaa0c4ca3e0d68b.zip | |
Merge branch 'develop'
Diffstat (limited to 'ethereum')
| -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 7bb668235..ecbf04c9a 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(".ethereum", lt, Identifier) + g, err := globalconf.NewWithOptions(&globalconf.Options{ + Filename: path.Join(ethutil.ApplicationFolder(".ethereal"), "conf.ini"), + }) + if err != nil { + fmt.Println(err) + } else { + g.ParseAll() + } + ethutil.ReadConfig(".ethereum", lt, g, Identifier) logger := ethutil.Config.Log |