From 1c5d720db4b4e0e7b8d33913f3b22cc4584149fa Mon Sep 17 00:00:00 2001
From: Matthias Radestock <matthias.radestock@gmail.com>
Date: Wed, 24 Dec 2014 13:38:17 +0000
Subject: [PATCH] simplify some more

---
 router/connection.go | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/router/connection.go b/router/connection.go
index dc521888..ff79fbf5 100644
--- a/router/connection.go
+++ b/router/connection.go
@@ -178,9 +178,6 @@ func (conn *LocalConnection) queryLoop(queryChan <-chan *ConnectionInteraction,
 			conn.log("error:", err)
 			break
 		}
-		heartbeat := tickerChan(conn.heartbeat)
-		fetchAll := tickerChan(conn.fetchAll)
-		fragTest := tickerChan(conn.fragTest)
 		select {
 		case query, ok := <-queryChan:
 			if !ok {
@@ -196,11 +193,11 @@ func (conn *LocalConnection) queryLoop(queryChan <-chan *ConnectionInteraction,
 			case CSendTCP:
 				err = conn.handleSendTCP(query.payload.([]byte))
 			}
-		case <-heartbeat:
+		case <-tickerChan(conn.heartbeat):
 			conn.forwardHeartbeatFrame()
-		case <-fetchAll:
+		case <-tickerChan(conn.fetchAll):
 			err = conn.handleSendTCP(ProtocolFetchAllByte)
-		case <-fragTest:
+		case <-tickerChan(conn.fragTest):
 			conn.setStackFrag(false)
 			err = conn.handleSendTCP(ProtocolStartFragmentationTestByte)