diff options
| author | obscuren <geffobscura@gmail.com> | 2015-04-09 23:40:28 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-04-09 23:40:28 +0800 |
| commit | 01ee01219713c80fc9064e9840b42ff2fce374d7 (patch) | |
| tree | 02daa2105b89b5b6419521785f6f54d217ed544c /eth | |
| parent | 0636e17dbee3accf6291000f0e4f4e713a97a207 (diff) | |
| parent | 764a802eaa33892447b82069ee1b1bb5a478837b (diff) | |
| download | dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar.gz dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar.bz2 dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar.lz dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar.xz dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.tar.zst dexon-01ee01219713c80fc9064e9840b42ff2fce374d7.zip | |
Merge branch 'ethersphere-frontier/blockpool' into develop
Diffstat (limited to 'eth')
| -rw-r--r-- | eth/protocol.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/eth/protocol.go b/eth/protocol.go index 09355cfcd..878038f74 100644 --- a/eth/protocol.go +++ b/eth/protocol.go @@ -8,6 +8,7 @@ import ( "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/errs" "github.com/ethereum/go-ethereum/logger" + "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/p2p" "github.com/ethereum/go-ethereum/rlp" ) @@ -366,7 +367,8 @@ func (self *ethProtocol) requestBlocks(hashes []common.Hash) error { func (self *ethProtocol) protoError(code int, format string, params ...interface{}) (err *errs.Error) { err = self.errors.New(code, format, params...) - err.Log(self.peer.Logger) + //err.Log(self.peer.Logger) + err.Log(glog.V(logger.Info)) return } @@ -382,8 +384,11 @@ func (self *ethProtocol) sendStatus() error { } func (self *ethProtocol) protoErrorDisconnect(err *errs.Error) { - err.Log(self.peer.Logger) - if err.Fatal() { - self.peer.Disconnect(p2p.DiscSubprotocolError) - } + //err.Log(self.peer.Logger) + err.Log(glog.V(logger.Info)) + /* + if err.Fatal() { + self.peer.Disconnect(p2p.DiscSubprotocolError) + } + */ } |