Move cleanup

This commit is contained in:
Viktor Liu 2025-06-12 20:48:35 +02:00
parent 381cc04651
commit ee3cffb0ee

View File

@ -302,6 +302,11 @@ func (s *DefaultServer) Stop() {
s.ctxCancel() s.ctxCancel()
if s.hostManager != nil { if s.hostManager != nil {
if srvs, ok := s.hostManager.(hostManagerWithOriginalNS); ok && len(srvs.getOriginalNameservers()) > 0 {
log.Debugf("deregistering original nameservers as fallback handlers")
s.deregisterHandler([]string{nbdns.RootZone}, PriorityFallback)
}
if err := s.hostManager.restoreHostDNS(); err != nil { if err := s.hostManager.restoreHostDNS(); err != nil {
log.Error("failed to restore host DNS settings: ", err) log.Error("failed to restore host DNS settings: ", err)
} else if err := s.stateManager.DeleteState(&ShutdownState{}); err != nil { } else if err := s.stateManager.DeleteState(&ShutdownState{}); err != nil {
@ -309,10 +314,6 @@ func (s *DefaultServer) Stop() {
} }
} }
if srvs, ok := s.hostManager.(hostManagerWithOriginalNS); ok && len(srvs.getOriginalNameservers()) > 0 {
s.deregisterHandler([]string{nbdns.RootZone}, PriorityFallback)
}
s.service.Stop() s.service.Stop()
maps.Clear(s.extraDomains) maps.Clear(s.extraDomains)