aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2014-09-25 03:21:03 +0800
committerobscuren <geffobscura@gmail.com>2014-09-25 03:21:03 +0800
commit5c2aa1d4f56ee02863ec426fe2248700ba58c4ab (patch)
tree50d9bea15d48d5a9ce11ec9be2a36532fbbf5878
parent496df5c29a28aaa03ac5ffbdcf36928095163a4f (diff)
parent5cb4120ef517830e8c45007f138ffd343ccb164a (diff)
downloadgo-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar.gz
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar.bz2
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar.lz
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar.xz
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.tar.zst
go-tangerine-5c2aa1d4f56ee02863ec426fe2248700ba58c4ab.zip
Merge branch 'master' into develop
-rw-r--r--peer.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/peer.go b/peer.go
index ef346d3ac..ede3ad4e4 100644
--- a/peer.go
+++ b/peer.go
@@ -311,7 +311,7 @@ func (p *Peer) writeMessage(msg *ethwire.Msg) {
func (p *Peer) HandleOutbound() {
// The ping timer. Makes sure that every 2 minutes a ping is send to the peer
pingTimer := time.NewTicker(pingPongTimer)
- serviceTimer := time.NewTicker(5 * time.Second)
+ serviceTimer := time.NewTicker(10 * time.Second)
out:
for {
@@ -346,7 +346,7 @@ out:
// posting or block posting
case <-serviceTimer.C:
- //p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
+ p.QueueMessage(ethwire.NewMessage(ethwire.MsgGetPeersTy, ""))
case <-p.quit:
// Break out of the for loop if a quit message is posted