Commit 15dfa943 authored by Erick Hitter's avatar Erick Hitter
Browse files

Use what Go provides for loops, instead of my hacky implementation

Does change behaviour slightly, in that first iteration includes the delay.
parent 8bdbfef1
...@@ -111,18 +111,15 @@ func spawnEventWorkers(queue <-chan event) { ...@@ -111,18 +111,15 @@ func spawnEventWorkers(queue <-chan event) {
} }
func retrieveSitesPeriodically(sites chan<- site) { func retrieveSitesPeriodically(sites chan<- site) {
for { for range time.Tick(getEventsLoop) {
siteList, err := getSites() siteList, err := getSites()
if err != nil { if err != nil {
time.Sleep(getEventsLoop)
continue continue
} }
for _, site := range siteList { for _, site := range siteList {
sites <- site sites <- site
} }
time.Sleep(getEventsLoop)
} }
} }
...@@ -133,15 +130,12 @@ func heartbeat() { ...@@ -133,15 +130,12 @@ func heartbeat() {
} }
interval := time.Duration(heartbeatInt) * time.Second interval := time.Duration(heartbeatInt) * time.Second
time.Sleep(interval)
for { for range time.Tick(interval) {
successCount, errCount := atomic.LoadUint64(&eventRunSuccessCount), atomic.LoadUint64(&eventRunErrCount) successCount, errCount := atomic.LoadUint64(&eventRunSuccessCount), atomic.LoadUint64(&eventRunErrCount)
atomic.SwapUint64(&eventRunSuccessCount, 0) atomic.SwapUint64(&eventRunSuccessCount, 0)
atomic.SwapUint64(&eventRunErrCount, 0) atomic.SwapUint64(&eventRunErrCount, 0)
logger.Printf("<heartbeat eventsSucceededSinceLast=%d eventsErroredSinceLast=%d>", successCount, errCount) logger.Printf("<heartbeat eventsSucceededSinceLast=%d eventsErroredSinceLast=%d>", successCount, errCount)
time.Sleep(interval)
} }
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment