From 29c206611e5a2344559c2d01aa0d7d8bf75f792d Mon Sep 17 00:00:00 2001 From: Jimmy Zelinskie Date: Fri, 8 Jan 2016 15:55:10 -0500 Subject: [PATCH] replace time.NewTicker().C with time.After They are synonymous and time.After is much easier to read. --- stats/stats.go | 2 +- tracker/tracker.go | 2 +- udp/udp.go | 6 ++---- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/stats/stats.go b/stats/stats.go index e3a00fc..9c056b0 100644 --- a/stats/stats.go +++ b/stats/stats.go @@ -122,7 +122,7 @@ func New(cfg config.StatsConfig) *Stats { if cfg.IncludeMem { s.MemStatsWrapper = NewMemStatsWrapper(cfg.VerboseMem) - s.recordMemStats = time.NewTicker(cfg.MemUpdateInterval.Duration).C + s.recordMemStats = time.After(cfg.MemUpdateInterval.Duration) } s.flattened = flatjson.Flatten(s) diff --git a/tracker/tracker.go b/tracker/tracker.go index 7ee38e5..09a15a2 100644 --- a/tracker/tracker.go +++ b/tracker/tracker.go @@ -96,7 +96,7 @@ func (tkr *Tracker) purgeInactivePeers(purgeEmptyTorrents bool, threshold, inter case <-tkr.shuttingDown: return - case <-time.NewTicker(interval).C: + case <-time.After(interval): before := time.Now().Add(-threshold) glog.V(0).Infof("Purging peers with no announces since %s", before) diff --git a/udp/udp.go b/udp/udp.go index 9920911..fa89200 100644 --- a/udp/udp.go +++ b/udp/udp.go @@ -107,14 +107,12 @@ func (s *Server) Serve() { s.wg.Add(1) go func() { defer s.wg.Done() - // Generate a new IV every hour. - t := time.NewTicker(time.Hour) for { select { - case <-t.C: - s.connIDGen.NewIV() case <-s.closing: return + case <-time.After(time.Hour): + s.connIDGen.NewIV() } } }()