rename logger pkg and logger instance var

This commit is contained in:
zelig 2014-12-14 23:17:27 +00:00
parent 702801a549
commit 835bf56efd
2 changed files with 8 additions and 8 deletions

View file

@ -10,7 +10,7 @@ import (
"github.com/ethereum/go-ethereum/crypto"
"github.com/ethereum/go-ethereum/ethutil"
"github.com/ethereum/go-ethereum/event"
ethlogger "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/p2p"
"github.com/ethereum/go-ethereum/pow/ezp"
"github.com/ethereum/go-ethereum/rpc"
@ -21,7 +21,7 @@ const (
seedNodeAddress = "poc-7.ethdev.com:30300"
)
var logger = ethlogger.NewLogger("SERV")
var ethlogger = logger.NewLogger("SERV")
type Ethereum struct {
// Channel for shutting down the ethereum
@ -206,20 +206,20 @@ func (s *Ethereum) Start(seed bool) error {
// TODO: read peers here
if seed {
logger.Infof("Connect to seed node %v", seedNodeAddress)
ethlogger.Infof("Connect to seed node %v", seedNodeAddress)
if err := s.SuggestPeer(seedNodeAddress); err != nil {
return err
}
}
logger.Infoln("Server started")
ethlogger.Infoln("Server started")
return nil
}
func (self *Ethereum) SuggestPeer(addr string) error {
netaddr, err := net.ResolveTCPAddr("tcp", addr)
if err != nil {
logger.Errorf("couldn't resolve %s:", addr, err)
ethlogger.Errorf("couldn't resolve %s:", addr, err)
return err
}
@ -245,7 +245,7 @@ func (s *Ethereum) Stop() {
s.eventMux.Stop()
s.blockPool.Stop()
logger.Infoln("Server stopped")
ethlogger.Infoln("Server stopped")
close(s.shutdownChan)
}

View file

@ -10,11 +10,11 @@ import (
"github.com/ethereum/go-ethereum/core/types"
"github.com/ethereum/go-ethereum/ethutil"
ethlogger "github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/pow"
)
var poolLogger = ethlogger.NewLogger("Blockpool")
var poolLogger = logger.NewLogger("Blockpool")
const (
blockHashesBatchSize = 256