From d0892abc2c98a78aae04a6994712ef20bfe1cb93 Mon Sep 17 00:00:00 2001 From: Sandeep Rajan Date: Thu, 8 Feb 2018 13:57:49 -0500 Subject: [PATCH] add sync for proper termination (#1507) --- plugin/reload/setup.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/plugin/reload/setup.go b/plugin/reload/setup.go index 480bd5b74..08b70e5ed 100644 --- a/plugin/reload/setup.go +++ b/plugin/reload/setup.go @@ -24,6 +24,7 @@ func init() { // WARNING: this data may be unsync after an invalid attempt of reload Corefile. var r = reload{interval: defaultInterval, usage: unused, quit: make(chan bool)} var once sync.Once +var shutOnce sync.Once func setup(c *caddy.Controller) error { c.Next() // 'reload' @@ -73,9 +74,11 @@ func setup(c *caddy.Controller) error { }) // re-register on finalShutDown as the instance most-likely will be changed - c.OnFinalShutdown(func() error { - r.quit <- true - return nil + shutOnce.Do(func() { + c.OnFinalShutdown(func() error { + r.quit <- true + return nil + }) }) return nil }