Merge branch 'master' into develop
This commit is contained in:
commit
5c2aa1d4f5
4
peer.go
4
peer.go
|
@ -311,7 +311,7 @@ func (p *Peer) writeMessage(msg *ethwire.Msg) {
|
||||||
func (p *Peer) HandleOutbound() {
|
func (p *Peer) HandleOutbound() {
|
||||||
// The ping timer. Makes sure that every 2 minutes a ping is send to the peer
|
// The ping timer. Makes sure that every 2 minutes a ping is send to the peer
|
||||||
pingTimer := time.NewTicker(pingPongTimer)
|
pingTimer := time.NewTicker(pingPongTimer)
|
||||||
serviceTimer := time.NewTicker(5 * time.Second)
|
serviceTimer := time.NewTicker(10 * time.Second)
|
||||||
|
|
||||||
out:
|
out:
|
||||||
for {
|
for {
|
||||||
|
@ -346,7 +346,7 @@ out:
|
||||||
// posting or block posting
|
// posting or block posting
|
||||||
case <-serviceTimer.C:
|
case <-serviceTimer.C:
|
||||||
|
|
||||||
//p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
|
p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
|
||||||
|
|
||||||
case <-p.quit:
|
case <-p.quit:
|
||||||
// Break out of the for loop if a quit message is posted
|
// Break out of the for loop if a quit message is posted
|
||||||
|
|
Loading…
Reference in New Issue