aboutsummaryrefslogtreecommitdiffstats
path: root/ethereal/ethereum.go
diff options
context:
space:
mode:
Diffstat (limited to 'ethereal/ethereum.go')
-rw-r--r--ethereal/ethereum.go13
1 files changed, 12 insertions, 1 deletions
diff --git a/ethereal/ethereum.go b/ethereal/ethereum.go
index 2867e30d4..a7e43cd9a 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(".ethereal"), "conf.ini"),
+ })
+ if err != nil {
+ fmt.Println(err)
+ } else {
+ g.ParseAll()
+ }
+ ethutil.ReadConfig(".ethereal", ethutil.LogFile|ethutil.LogStd, Identifier)
// Instantiated a eth stack
ethereum, err := eth.New(eth.CapDefault, UseUPnP)