From 9798dd067f53a74e3777cff539b2f01617c107c6 Mon Sep 17 00:00:00 2001 From: Yong Tang Date: Thu, 24 Sep 2020 11:30:39 -0700 Subject: Cherry-pick: Implement notifies for transfer plugin (#3972) (#4142) * Implement notifies for transfer plugin (#3972) * Fix notifies in transfer plugin Signed-off-by: Miek Gieben * Make it compile Signed-off-by: Miek Gieben * Port more plugins Signed-off-by: Miek Gieben * golint Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * Fix notifies in transfer plugin Signed-off-by: Miek Gieben * Make it compile Signed-off-by: Miek Gieben * Port more plugins Signed-off-by: Miek Gieben * golint Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * Fix tests Signed-off-by: Miek Gieben * really fix test Signed-off-by: Miek Gieben * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben * Add transfer tests copied and modified from #3452 Signed-off-by: Miek Gieben * Test correct selection of plugin Signed-off-by: Miek Gieben * add upstream back in Signed-off-by: Miek Gieben * Implement ixfr fallback and unify file and auto for transfering Signed-off-by: Miek Gieben * fix test Signed-off-by: Miek Gieben * properly merge Signed-off-by: Miek Gieben * Remove plugin/kubernetes/setup_transfer_test.go Signed-off-by: Yong Tang Co-authored-by: Miek Gieben --- plugin/file/reload.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'plugin/file/reload.go') diff --git a/plugin/file/reload.go b/plugin/file/reload.go index 79db040fe..426a986b0 100644 --- a/plugin/file/reload.go +++ b/plugin/file/reload.go @@ -3,10 +3,12 @@ package file import ( "os" "time" + + "github.com/coredns/coredns/plugin/transfer" ) // Reload reloads a zone when it is changed on disk. If z.NoReload is true, no reloading will be done. -func (z *Zone) Reload() error { +func (z *Zone) Reload(t *transfer.Transfer) error { if z.ReloadInterval == 0 { return nil } @@ -40,7 +42,11 @@ func (z *Zone) Reload() error { z.Unlock() log.Infof("Successfully reloaded zone %q in %q with %d SOA serial", z.origin, zFile, z.Apex.SOA.Serial) - z.Notify() + if t != nil { + if err := t.Notify(z.origin); err != nil { + log.Warningf("Failed sending notifies: %s", err) + } + } case <-z.reloadShutdown: tick.Stop() -- cgit v1.2.3