From 22da76e8ab4dc9752f0e4d3871f54fa9cdee5595 Mon Sep 17 00:00:00 2001 From: Johannes 'fish' Ziemke Date: Thu, 25 Apr 2013 13:04:45 +0200 Subject: [PATCH] Close of reportTicker to exit goroutine. --- storage/metric/tiered.go | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/storage/metric/tiered.go b/storage/metric/tiered.go index d68835b6c8..69fecb945a 100644 --- a/storage/metric/tiered.go +++ b/storage/metric/tiered.go @@ -164,20 +164,13 @@ func (t *tieredStorage) Serve() { var ( flushMemoryTicker = time.Tick(t.flushMemoryInterval) writeMemoryTicker = time.Tick(t.writeMemoryInterval) - stopReport = make(chan bool) + reportTicker = time.NewTicker(time.Second) ) - defer func() { close(stopReport) }() + defer reportTicker.Stop() go func() { - reportTicker := time.Tick(time.Second) - - for { - select { - case <-reportTicker: - t.reportQueues() - case <-stopReport: - return - } + for _ = range reportTicker.C { + t.reportQueues() } }()