diff --git a/dnsforward/dnsforward.go b/dnsforward/dnsforward.go index ccfa410b..f87ee219 100644 --- a/dnsforward/dnsforward.go +++ b/dnsforward/dnsforward.go @@ -352,23 +352,6 @@ func (s *Server) IsRunning() bool { return s.isRunning } -// Restart - restart server -func (s *Server) Restart() error { - s.Lock() - defer s.Unlock() - log.Print("Start reconfiguring the server") - err := s.stopInternal() - if err != nil { - return errorx.Decorate(err, "could not reconfigure the server") - } - err = s.startInternal() - if err != nil { - return errorx.Decorate(err, "could not reconfigure the server") - } - - return nil -} - // Reconfigure applies the new configuration to the DNS server func (s *Server) Reconfigure(config *ServerConfig) error { s.Lock() diff --git a/dnsforward/dnsforward_http.go b/dnsforward/dnsforward_http.go index e0ddd36b..86bcdd3a 100644 --- a/dnsforward/dnsforward_http.go +++ b/dnsforward/dnsforward_http.go @@ -121,7 +121,7 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) { s.conf.ConfigModified() if restart { - err = s.Restart() + err = s.Reconfigure(nil) if err != nil { httpError(r, w, http.StatusInternalServerError, "%s", err) return @@ -172,7 +172,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request) s.Unlock() s.conf.ConfigModified() - err = s.Restart() + err = s.Reconfigure(nil) if err != nil { httpError(r, w, http.StatusInternalServerError, "%s", err) return