diff --git a/eth/backend.go b/eth/backend.go index c1fd59bf3e..4c24a5b1b5 100644 --- a/eth/backend.go +++ b/eth/backend.go @@ -244,20 +244,20 @@ func (s *Ethereum) Start(seed bool) error { // TODO: read peers here if seed { - ethlogger.Infof("Connect to seed node %v", seedNodeAddress) + logger.Infof("Connect to seed node %v", seedNodeAddress) if err := s.SuggestPeer(seedNodeAddress); err != nil { return err } } - ethlogger.Infoln("Server started") + logger.Infoln("Server started") return nil } func (self *Ethereum) SuggestPeer(addr string) error { netaddr, err := net.ResolveTCPAddr("tcp", addr) if err != nil { - ethlogger.Errorf("couldn't resolve %s:", addr, err) + logger.Errorf("couldn't resolve %s:", addr, err) return err } @@ -284,7 +284,7 @@ func (s *Ethereum) Stop() { s.whisper.Stop() } - ethlogger.Infoln("Server stopped") + logger.Infoln("Server stopped") close(s.shutdownChan) } diff --git a/eth/block_pool_test.go b/eth/block_pool_test.go index d450ab7d6d..b50a314ead 100644 --- a/eth/block_pool_test.go +++ b/eth/block_pool_test.go @@ -12,19 +12,19 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/logger" + ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/pow" ) const waitTimeout = 60 // seconds -var logsys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugLevel)) +var logsys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugLevel)) var ini = false func logInit() { if !ini { - logger.AddLogSystem(logsys) + ethlogger.AddLogSystem(logsys) ini = true } } diff --git a/eth/protocol_test.go b/eth/protocol_test.go index d5c2bad467..ab2aa289f0 100644 --- a/eth/protocol_test.go +++ b/eth/protocol_test.go @@ -12,11 +12,11 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethutil" - "github.com/ethereum/go-ethereum/logger" + ethlogger "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/p2p" ) -var sys = logger.NewStdLogSystem(os.Stdout, log.LstdFlags, logger.LogLevel(logger.DebugDetailLevel)) +var sys = ethlogger.NewStdLogSystem(os.Stdout, log.LstdFlags, ethlogger.LogLevel(ethlogger.DebugDetailLevel)) type testMsgReadWriter struct { in chan p2p.Msg @@ -227,7 +227,7 @@ func (self *ethProtocolTester) run() { } func TestStatusMsgErrors(t *testing.T) { - logger.AddLogSystem(sys) + logInit() eth := newEth(t) td := ethutil.Big1 currentBlock := []byte{1}