diff options
| author |  Joey Espinosa <jlouis.espinosa@gmail.com>
| 2018-07-03 06:20:39 -0400 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2018-07-03 11:20:39 +0100 |
| commit | c2780f42c446dd1e6d5cbba7be9d07d297666d96 (patch) | |
| tree | 9cb8eba09673c6510081a3152f29876fd304e1b5 /plugin/file/reload.go | |
| parent | 908d4fbd230ce8c64c1b6b1ea9a0de558c00bdd7 (diff) | |
| download | coredns-c2780f42c446dd1e6d5cbba7be9d07d297666d96.tar.gz coredns-c2780f42c446dd1e6d5cbba7be9d07d297666d96.tar.zst coredns-c2780f42c446dd1e6d5cbba7be9d07d297666d96.zip | |
Updating filepath in auto plugin if existing zone's file changes location (#1901) (#1910)
Exporting Zone.File to avoid getters and setters
Updating getter and setter for Zone.File to be less racy
Renaming GetFile to File in zone plugin
Diffstat (limited to 'plugin/file/reload.go')
| -rw-r--r-- | plugin/file/reload.go | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/plugin/file/reload.go b/plugin/file/reload.go index af06b98ac..7c0fe8544 100644 --- a/plugin/file/reload.go +++ b/plugin/file/reload.go @@ -22,14 +22,15 @@ func (z *Zone) Reload() error { select { case <-tick.C: - reader, err := os.Open(z.file) + zFile := z.File() + reader, err := os.Open(zFile) if err != nil { - log.Errorf("Failed to open zone %q in %q: %v", z.origin, z.file, err) + log.Errorf("Failed to open zone %q in %q: %v", z.origin, zFile, err) continue } serial := z.SOASerialIfDefined() - zone, err := Parse(reader, z.origin, z.file, serial) + zone, err := Parse(reader, z.origin, zFile, serial) if err != nil { if _, ok := err.(*serialErr); !ok { log.Errorf("Parsing zone %q: %v", z.origin, err) @@ -43,7 +44,7 @@ func (z *Zone) Reload() error { z.Tree = zone.Tree z.reloadMu.Unlock() - log.Infof("Successfully reloaded zone %q in %q with serial %d", z.origin, z.file, z.Apex.SOA.Serial) + log.Infof("Successfully reloaded zone %q in %q with serial %d", z.origin, zFile, z.Apex.SOA.Serial) z.Notify() case <-z.reloadShutdown: |