aboutsummaryrefslogtreecommitdiff
path: root/core/sigtrap_posix.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/sigtrap_posix.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/sigtrap_posix.go')
-rw-r--r--core/sigtrap_posix.go20
1 files changed, 10 insertions, 10 deletions
diff --git a/core/sigtrap_posix.go b/core/sigtrap_posix.go
index 5ba5fcd1b..d120dd52b 100644
--- a/core/sigtrap_posix.go
+++ b/core/sigtrap_posix.go
@@ -48,28 +48,28 @@ func trapSignalsPosix() {
case syscall.SIGUSR1:
log.Println("[INFO] SIGUSR1: Reloading")
- var updatedCaddyfile Input
+ var updatedCorefile Input
- caddyfileMu.Lock()
- if caddyfile == nil {
+ corefileMu.Lock()
+ if corefile == nil {
// Hmm, did spawing process forget to close stdin? Anyhow, this is unusual.
log.Println("[ERROR] SIGUSR1: no Corefile to reload (was stdin left open?)")
- caddyfileMu.Unlock()
+ corefileMu.Unlock()
continue
}
- if caddyfile.IsFile() {
- body, err := ioutil.ReadFile(caddyfile.Path())
+ if corefile.IsFile() {
+ body, err := ioutil.ReadFile(corefile.Path())
if err == nil {
- updatedCaddyfile = CaddyfileInput{
- Filepath: caddyfile.Path(),
+ updatedCorefile = CorefileInput{
+ Filepath: corefile.Path(),
Contents: body,
RealFile: true,
}
}
}
- caddyfileMu.Unlock()
+ corefileMu.Unlock()
- err := Restart(updatedCaddyfile)
+ err := Restart(updatedCorefile)
if err != nil {
log.Printf("[ERROR] SIGUSR1: %v", err)
}