a
/
badguardhome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge: - DNS: configuration settings were not applied until full restart 

* commit 'd65cdd4544efdecb9bbe36e411c0bbcb6475ba94':
  - DNS: configuration settings were not applied until full restart
This commit is contained in:
Andrey Meshkov 2019-12-19 15:03:13 +03:00
parent cde15afd90 d65cdd4544
commit 041ea65d14
2 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
dnsforward/dnsforward.go
View File

@ -352,23 +352,6 @@ func (s *Server) IsRunning() bool {
return s.isRunning 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 // Reconfigure applies the new configuration to the DNS server
func (s *Server) Reconfigure(config *ServerConfig) error { func (s *Server) Reconfigure(config *ServerConfig) error {
s.Lock() s.Lock()

4
dnsforward/dnsforward_http.go
View File

@ -121,7 +121,7 @@ func (s *Server) handleSetConfig(w http.ResponseWriter, r *http.Request) {
s.conf.ConfigModified() s.conf.ConfigModified()
if restart { if restart {
err = s.Restart() err = s.Reconfigure(nil)
if err != nil { if err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err) httpError(r, w, http.StatusInternalServerError, "%s", err)
return return
@ -172,7 +172,7 @@ func (s *Server) handleSetUpstreamConfig(w http.ResponseWriter, r *http.Request)
s.Unlock() s.Unlock()
s.conf.ConfigModified() s.conf.ConfigModified()
err = s.Restart() err = s.Reconfigure(nil)
if err != nil { if err != nil {
httpError(r, w, http.StatusInternalServerError, "%s", err) httpError(r, w, http.StatusInternalServerError, "%s", err)
return return