aboutsummaryrefslogtreecommitdiff
path: root/core/restart_windows.go
diff options
context:
space:
mode:
authorGravatar Michael Richmond <mrichmon@users.noreply.github.com> 2016-04-28 11:07:44 -0700
committerGravatar Miek Gieben <miek@miek.nl> 2016-04-28 19:07:44 +0100
commite34280e7af517443a8f95e76247cf614c37fdbf6 (patch)
treef911eb03ff8e71d7f4c245e0694d3b47e2198734 /core/restart_windows.go
parentbba63f776518347f53697160fce638419c3fe813 (diff)
downloadcoredns-e34280e7af517443a8f95e76247cf614c37fdbf6.tar.gz
coredns-e34280e7af517443a8f95e76247cf614c37fdbf6.tar.zst
coredns-e34280e7af517443a8f95e76247cf614c37fdbf6.zip
Clean up remove caddy refs (#139)
* Changed reference to Caddy over to CoreDNS * Removing references to caddy * Fixed misleading error message to reference coredns * Cleaning up references to caddy * Adding clean and deps targets Muscle memory is resulting in "make clean" commands. * Adding test target to makefile * More "Caddy" cleanup
Diffstat (limited to 'core/restart_windows.go')
-rw-r--r--core/restart_windows.go16
1 files changed, 8 insertions, 8 deletions
diff --git a/core/restart_windows.go b/core/restart_windows.go
index c2a4f557a..8a0805a19 100644
--- a/core/restart_windows.go
+++ b/core/restart_windows.go
@@ -2,15 +2,15 @@ package core
import "log"
-// Restart restarts Caddy forcefully using newCaddyfile,
-// or, if nil, the current/existing Caddyfile is reused.
-func Restart(newCaddyfile Input) error {
+// Restart restarts CoreDNS forcefully using newCorefile,
+// or, if nil, the current/existing Corefile is reused.
+func Restart(newCorefile Input) error {
log.Println("[INFO] Restarting")
- if newCaddyfile == nil {
- caddyfileMu.Lock()
- newCaddyfile = caddyfile
- caddyfileMu.Unlock()
+ if newCorefile == nil {
+ corefileMu.Lock()
+ newCorefile = corefile
+ corefileMu.Unlock()
}
wg.Add(1) // barrier so Wait() doesn't unblock
@@ -20,7 +20,7 @@ func Restart(newCaddyfile Input) error {
return err
}
- err = Start(newCaddyfile)
+ err = Start(newCorefile)
if err != nil {
return err
}