From 063e673bc4575532d30600405d4b60f4ee74282c Mon Sep 17 00:00:00 2001
From: Isolus <mail@bjoern-kinscher.de>
Date: Tue, 3 Jul 2018 18:22:00 +0200
Subject: [PATCH] plugin/file: fix zone expiration (#1933)

---
 plugin/file/secondary.go | 27 +++++++++++++++------------
 1 file 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
+
 		}
 	}
 }