aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Isolus <mail@bjoern-kinscher.de> 2018-07-03 18:22:00 +0200
committerGravatar Miek Gieben <miek@miek.nl> 2018-07-03 17:22:00 +0100
commit063e673bc4575532d30600405d4b60f4ee74282c (patch)
tree65130296c999956e7c078368ecdd48d0281995fd
parentee3c9894d98bb7f9e3a2bfcf1cf50df20fcdbc6e (diff)
downloadcoredns-063e673bc4575532d30600405d4b60f4ee74282c.tar.gz
coredns-063e673bc4575532d30600405d4b60f4ee74282c.tar.zst
coredns-063e673bc4575532d30600405d4b60f4ee74282c.zip
plugin/file: fix zone expiration (#1933)
-rw-r--r--plugin/file/secondary.go27
1 files changed, 15 insertions, 12 deletions
diff --git a/plugin/file/secondary.go b/plugin/file/secondary.go
index dc732ee66..39f79f2b1 100644
--- a/plugin/file/secondary.go
+++ b/plugin/file/secondary.go
@@ -147,14 +147,15 @@ Restart:
// transfer failed, leave retryActive true
break
}
- retryActive = false
- // transfer OK, possible new SOA, stop timers and redo
- refreshTicker.Stop()
- retryTicker.Stop()
- expireTicker.Stop()
- goto Restart
}
+ // no errors, stop timers and restart
+ retryActive = false
+ refreshTicker.Stop()
+ retryTicker.Stop()
+ expireTicker.Stop()
+ goto Restart
+
case <-refreshTicker.C:
time.Sleep(jitter(5000)) // 5s randomize
@@ -172,13 +173,15 @@ Restart:
retryActive = true
break
}
- retryActive = false
- // transfer OK, possible new SOA, stop timers and redo
- refreshTicker.Stop()
- retryTicker.Stop()
- expireTicker.Stop()
- goto Restart
}
+
+ // no errors, stop timers and restart
+ retryActive = false
+ refreshTicker.Stop()
+ retryTicker.Stop()
+ expireTicker.Stop()
+ goto Restart
+
}
}
}