forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 12:46:44 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ethlogger -> logger

Browse source
This commit is contained in:
zelig 2015-01-04 16:04:33 +00:00
parent 5d957e6d9a
commit 8dc0888718
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
eth/backend.go
View file

@ -244,20 +244,20 @@ func (s *Ethereum) Start(seed bool) error {
// TODO: read peers here // TODO: read peers here
if seed { 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 { if err := s.SuggestPeer(seedNodeAddress); err != nil {
return err return err
} }
} }
ethlogger.Infoln("Server started") logger.Infoln("Server started")
return nil return nil
} }
func (self *Ethereum) SuggestPeer(addr string) error { func (self *Ethereum) SuggestPeer(addr string) error {
netaddr, err := net.ResolveTCPAddr("tcp", addr) netaddr, err := net.ResolveTCPAddr("tcp", addr)
if err != nil { if err != nil {
ethlogger.Errorf("couldn't resolve %s:", addr, err) logger.Errorf("couldn't resolve %s:", addr, err)
return err return err
} }
@ -284,7 +284,7 @@ func (s *Ethereum) Stop() {
s.whisper.Stop() s.whisper.Stop()
} }
ethlogger.Infoln("Server stopped") logger.Infoln("Server stopped")
close(s.shutdownChan) close(s.shutdownChan)
} }

6
eth/block_pool_test.go
View file

@ -12,19 +12,19 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "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" "github.com/ethereum/go-ethereum/pow"
) )
const waitTimeout = 60 // seconds 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 var ini = false
func logInit() { func logInit() {
if !ini { if !ini {
logger.AddLogSystem(logsys) ethlogger.AddLogSystem(logsys)
ini = true ini = true
} }
} }

6
eth/protocol_test.go
View file

@ -12,11 +12,11 @@ import (
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil" "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" "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 { type testMsgReadWriter struct {
in chan p2p.Msg in chan p2p.Msg
@ -227,7 +227,7 @@ func (self *ethProtocolTester) run() {
} }
func TestStatusMsgErrors(t *testing.T) { func TestStatusMsgErrors(t *testing.T) {
logger.AddLogSystem(sys) logInit()
eth := newEth(t) eth := newEth(t)
td := ethutil.Big1 td := ethutil.Big1
currentBlock := []byte{1} currentBlock := []byte{1}