aboutsummaryrefslogtreecommitdiffstats
path: root/ethereum/ethereum.go
diff options
context:
space:
mode:
Diffstat (limited to 'ethereum/ethereum.go')
-rw-r--r--ethereum/ethereum.go12
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