middleware/file: add test for reload (#361)

This add a highlevel integration test for zone reloading. It also
fixes a data race in the actual reloading process.

1 files changed, 4 insertions, 2 deletions

diff --git a/middleware/file/zone.go b/middleware/file/zone.go
index b503aa5d2..b71822d4e 100644
--- a/middleware/file/zone.go
+++ b/middleware/file/zone.go
@@ -163,22 +163,24 @@ func (z *Zone) Reload() error {
 			select {
 			case event := <-watcher.Events:
 				if event.Op == fsnotify.Write && path.Clean(event.Name) == z.file {
+
 					reader, err := os.Open(z.file)
 					if err != nil {
 						log.Printf("[ERROR] Failed to open `%s' for `%s': %v", z.file, z.origin, err)
 						continue
 					}
-					z.reloadMu.Lock()
 					zone, err := Parse(reader, z.origin, z.file)
 					if err != nil {
 						log.Printf("[ERROR] Failed to parse `%s': %v", z.origin, err)
-						z.reloadMu.Unlock()
 						continue
 					}
+
 					// copy elements we need
+					z.reloadMu.Lock()
 					z.Apex = zone.Apex
 					z.Tree = zone.Tree
 					z.reloadMu.Unlock()
+
 					log.Printf("[INFO] Successfully reloaded zone `%s'", z.origin)
 					z.Notify()
 				}