vikarti.anatra/safing-portmaster
1
0
Fork 0
mirror of https://github.com/safing/portmaster synced 2025-09-04 11:39:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Improve missing dns servers module error

Browse source
This commit is contained in:
Daniel 2020-11-04 14:49:57 +01:00
parent a0268ee91d
commit 30f84e8009
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
resolver/resolvers.go
View file

@ -204,28 +204,32 @@ func getSystemResolvers() (resolvers []*Resolver) {
return resolvers return resolvers
} }
const missingResolversErrorID = "missing-resolvers"
func loadResolvers() { func loadResolvers() {
// TODO: what happens when a lot of processes want to reload at once? we do not need to run this multiple times in a short time frame. // TODO: what happens when a lot of processes want to reload at once? we do not need to run this multiple times in a short time frame.
resolversLock.Lock() resolversLock.Lock()
defer resolversLock.Unlock() defer resolversLock.Unlock()
// Resolve module error about missing resolvers.
module.Resolve(missingResolversErrorID)
newResolvers := append( newResolvers := append(
getConfiguredResolvers(configuredNameServers()), getConfiguredResolvers(configuredNameServers()),
getSystemResolvers()..., getSystemResolvers()...,
) )
if len(newResolvers) == 0 { if len(newResolvers) == 0 {
msg := "no (valid) dns servers found in (user) configuration or system, falling back to defaults" msg := "no (valid) dns servers found in configuration or system, falling back to defaults"
log.Warningf("resolver: %s", msg) log.Warningf("resolver: %s", msg)
module.Warning("no-valid-user-resolvers", msg) module.Warning(missingResolversErrorID, msg)
// load defaults directly, overriding config system // load defaults directly, overriding config system
newResolvers = getConfiguredResolvers(defaultNameServers) newResolvers = getConfiguredResolvers(defaultNameServers)
if len(newResolvers) == 0 { if len(newResolvers) == 0 {
msg = "no (valid) dns servers found in configuration or system" msg = "no (valid) dns servers found in configuration or system"
log.Criticalf("resolver: %s", msg) log.Criticalf("resolver: %s", msg)
module.Error("no-valid-default-resolvers", msg) module.Error(missingResolversErrorID, msg)
return
} }
} }