diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
| commit | c8438979a9c5c73bf68a132d5fd0325863ab454b (patch) | |
| tree | 1792da4ffa92e3a225bd37079c0458ea4b101d23 /p2p | |
| parent | 141d3caabbfbebbbecac455462a40b6056aa3821 (diff) | |
| parent | 394e0f60c20206c7f7c4c76551d11a2b14b23a4d (diff) | |
| download | dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.gz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.bz2 dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.lz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.xz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.zst dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'p2p')
| -rw-r--r-- | p2p/server.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/p2p/server.go b/p2p/server.go index a6bbd9260..91bc4af5c 100644 --- a/p2p/server.go +++ b/p2p/server.go @@ -9,7 +9,7 @@ import ( "sync" "time" - "github.com/ethereum/eth-go/ethlog" + logpkg "github.com/ethereum/go-ethereum/logger" ) const ( @@ -93,7 +93,7 @@ type Server struct { handlers Handlers } -var logger = ethlog.NewLogger("P2P") +var logger = logpkg.NewLogger("P2P") func New(network Network, addr net.Addr, identity ClientIdentity, handlers Handlers, maxPeers int, blacklist Blacklist) *Server { // get alphabetical list of protocol names from handlers map |