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 /ethereal/ethereum.go | |
| parent | 72df038d25c50a27adae8ea528dcedd3537267cf (diff) | |
| parent | 1d300bbc108f9d404d2eb5cbc8990042c0129f04 (diff) | |
| download | go-tangerine-50fdfb127ac35120315628a286f0a507c4470a89.tar.gz go-tangerine-50fdfb127ac35120315628a286f0a507c4470a89.tar.zst go-tangerine-50fdfb127ac35120315628a286f0a507c4470a89.zip | |
Merge branch 'develop' of github.com:ethereum/go-ethereum into develop
Diffstat (limited to 'ethereal/ethereum.go')
| -rw-r--r-- | ethereal/ethereum.go | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go index 30187d956..7ace16760 100644 --- a/ethereal/ethereum.go +++ b/ethereal/ethereum.go @@ -8,9 +8,11 @@ import ( "github.com/ethereum/go-ethereum/ethereal/ui" "github.com/ethereum/go-ethereum/utils" "github.com/go-qml/qml" + "github.com/rakyll/globalconf" "log" "os" "os/signal" + "path" "runtime" ) @@ -39,7 +41,16 @@ func main() { runtime.GOMAXPROCS(runtime.NumCPU()) ethchain.InitFees() - ethutil.ReadConfig(DataDir, ethutil.LogFile|ethutil.LogStd, 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, ethutil.LogFile|ethutil.LogStd, g, Identifier) // Instantiated a eth stack ethereum, err := eth.New(eth.CapDefault, UseUPnP) @@ -108,9 +119,11 @@ save these words so you can restore your account later: %s os.Exit(0) } - if StartMining { - utils.DoMining(ethereum) - } + /* + if StartMining { + utils.DoMining(ethereum) + } + */ if StartRpc { utils.DoRpc(ethereum, RpcPort) |