From 25ed78c8f729f2af5198c2cf78ff1be8f8306581 Mon Sep 17 00:00:00 2001 From: Frank Schroeder Date: Mon, 23 Oct 2017 10:08:32 +0200 Subject: [PATCH] Revert "ae: make control flow more explicit" This reverts commit b9a8b53d5257d679c427422c324e6f124664db60. --- agent/ae/ae.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/agent/ae/ae.go b/agent/ae/ae.go index 83895f4d2b..6d6735b413 100644 --- a/agent/ae/ae.go +++ b/agent/ae/ae.go @@ -142,7 +142,6 @@ FullSync: case <-s.SyncFull.Notif(): select { case <-time.After(s.stagger(s.serverUpInterval)): - continue FullSync case <-s.ShutdownCh: return } @@ -150,11 +149,12 @@ FullSync: // retry full sync after some time // todo(fs): why don't we use s.Interval here? case <-time.After(s.retryFailInterval + s.stagger(s.retryFailInterval)): - continue FullSync case <-s.ShutdownCh: return } + + continue } // do partial syncs until it is time for a full sync again