fix log (#388)

[bytom/vapor.git] / node / node.go

diff --git a/node/node.go b/node/node.go
index 6994823..c160f17 100644 (file)
--- a/node/node.go
+++ b/node/node.go
@@ -6,7 +6,6 @@ import (
        "net"
        "net/http"
        _ "net/http/pprof"
-       "os"
        "path/filepath"
        "reflect"
 
@@ -26,6 +25,7 @@ import (
        dbm "github.com/vapor/database/leveldb"
        "github.com/vapor/env"
        "github.com/vapor/event"
+       vaporLog "github.com/vapor/log"
        "github.com/vapor/net/websocket"
        "github.com/vapor/netsync"
        "github.com/vapor/proposal/blockproposer"
@@ -66,6 +66,10 @@ func NewNode(config *cfg.Config) *Node {
                cmn.Exit(cmn.Fmt("Failed to load federated information:[%s]", err.Error()))
        }
 
+       if err:=vaporLog.InitLogFile(config);err!=nil{
+               log.WithField("err",err).Fatalln("InitLogFile failed")
+       }
+
        log.WithFields(log.Fields{
                "module":             logModule,
                "pubkey":             config.PrivateKey().XPub(),
@@ -74,8 +78,10 @@ func NewNode(config *cfg.Config) *Node {
                "fed_controlprogram": hex.EncodeToString(cfg.FederationWScript(config)),
        }).Info()
 
-       initLogFile(config)
-       initActiveNetParams(config)
+       if err := consensus.InitActiveNetParams(config.ChainID); err != nil {
+               log.Fatalf("Failed to init ActiveNetParams:[%s]", err.Error())
+       }
+
        initCommonConfig(config)
 
        // Get store
@@ -125,7 +131,7 @@ func NewNode(config *cfg.Config) *Node {
                }
        }
        fastSyncDB := dbm.NewDB("fastsync", config.DBBackend, config.DBDir())
-       syncManager, err := netsync.NewSyncManager(config, chain, txPool, dispatcher,fastSyncDB)
+       syncManager, err := netsync.NewSyncManager(config, chain, txPool, dispatcher, fastSyncDB)
        if err != nil {
                cmn.Exit(cmn.Fmt("Failed to create sync manager: %v", err))
        }
@@ -186,28 +192,6 @@ func lockDataDirectory(config *cfg.Config) error {
        return nil
 }
 
-func initActiveNetParams(config *cfg.Config) {
-       var exist bool
-       consensus.ActiveNetParams, exist = consensus.NetParams[config.ChainID]
-       if !exist {
-               cmn.Exit(cmn.Fmt("chain_id[%v] don't exist", config.ChainID))
-       }
-}
-
-func initLogFile(config *cfg.Config) {
-       if config.LogFile == "" {
-               return
-       }
-       cmn.EnsureDir(filepath.Dir(config.LogFile), 0700)
-       file, err := os.OpenFile(config.LogFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0666)
-       if err == nil {
-               log.SetOutput(file)
-       } else {
-               log.WithFields(log.Fields{"module": logModule, "err": err}).Info("using default")
-       }
-
-}
-
 func initCommonConfig(config *cfg.Config) {
        cfg.CommonConfig = config
 }