diff --git a/sigtrap_posix.go b/sigtrap_posix.go index bed5b111..89e8c17a 100644 --- a/sigtrap_posix.go +++ b/sigtrap_posix.go @@ -25,8 +25,6 @@ import ( // trapSignalsPosix captures POSIX-only signals. func trapSignalsPosix() { - signalToString := map[os.Signal]string{syscall.SIGHUP: "SIGHUP", syscall.SIGUSR1: "SIGUSR1"} - go func() { sigchan := make(chan os.Signal, 1) signal.Notify(sigchan, syscall.SIGTERM, syscall.SIGHUP, syscall.SIGQUIT, syscall.SIGUSR1, syscall.SIGUSR2) @@ -34,15 +32,15 @@ func trapSignalsPosix() { for sig := range sigchan { switch sig { case syscall.SIGQUIT: - log.Println("[INFO] SIGQUIT: Terminating process") + log.Println("[INFO] SIGQUIT: Quitting process immediately") if PidFile != "" { os.Remove(PidFile) } os.Exit(0) case syscall.SIGTERM: - log.Println("[INFO] SIGTERM: Shutting down") - exitCode := executeShutdownCallbacks(signalToString[sig]) + log.Println("[INFO] SIGTERM: Shutting down servers then terminating") + exitCode := executeShutdownCallbacks("SIGTERM") err := Stop() if err != nil { log.Printf("[ERROR] SIGTERM stop: %v", err) @@ -53,25 +51,25 @@ func trapSignalsPosix() { } os.Exit(exitCode) - case syscall.SIGUSR1, syscall.SIGHUP: - log.Printf("[INFO] %s: Reloading", signalToString[sig]) + case syscall.SIGUSR1: + log.Println("[INFO] SIGUSR1: Reloading") // Start with the existing Caddyfile caddyfileToUse, inst, err := getCurrentCaddyfile() if err != nil { - log.Printf("[ERROR] %s: %v", signalToString[sig], err) + log.Printf("[ERROR] SIGUSR1: %v", err) continue } if loaderUsed.loader == nil { // This also should never happen - log.Printf("[ERROR] %s: no Caddyfile loader with which to reload Caddyfile", signalToString[sig]) + log.Println("[ERROR] SIGUSR1: no Caddyfile loader with which to reload Caddyfile") continue } // Load the updated Caddyfile newCaddyfile, err := loaderUsed.loader.Load(inst.serverType) if err != nil { - log.Printf("[ERROR] %s: loading updated Caddyfile: %v", signalToString[sig], err) + log.Printf("[ERROR] SIGUSR1: loading updated Caddyfile: %v", err) continue } if newCaddyfile != nil { @@ -81,7 +79,7 @@ func trapSignalsPosix() { // Kick off the restart; our work is done _, err = inst.Restart(caddyfileToUse) if err != nil { - log.Printf("[ERROR] %s: %v", signalToString[sig], err) + log.Printf("[ERROR] SIGUSR1: %v", err) } case syscall.SIGUSR2: @@ -89,6 +87,9 @@ func trapSignalsPosix() { if err := Upgrade(); err != nil { log.Printf("[ERROR] SIGUSR2: upgrading: %v", err) } + + case syscall.SIGHUP: + // ignore; this signal is sometimes sent outside of the user's control } } }()