plugin/file: fix zone expiration (#1933)

063e673b · Isolus · Miek Gieben · ee3c9894 · 063e673b
Commit 063e673b authored Jul 03, 2018 by Isolus Committed by Miek Gieben Jul 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 12 deletions

plugin/file/secondary.go plugin/file/secondary.go +15 -12

No files found.
--- 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
+
 		}
 	}
 }