From 30f84e80098b384ee355885cb9b186085d261f59 Mon Sep 17 00:00:00 2001 From: Daniel Date: Wed, 4 Nov 2020 14:49:57 +0100 Subject: [PATCH] Improve missing dns servers module error --- resolver/resolvers.go | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/resolver/resolvers.go b/resolver/resolvers.go index 4bb6d205..2baeb2de 100644 --- a/resolver/resolvers.go +++ b/resolver/resolvers.go @@ -204,28 +204,32 @@ func getSystemResolvers() (resolvers []*Resolver) { return resolvers } +const missingResolversErrorID = "missing-resolvers" + 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. resolversLock.Lock() defer resolversLock.Unlock() + // Resolve module error about missing resolvers. + module.Resolve(missingResolversErrorID) + newResolvers := append( getConfiguredResolvers(configuredNameServers()), getSystemResolvers()..., ) 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) - module.Warning("no-valid-user-resolvers", msg) + module.Warning(missingResolversErrorID, msg) // load defaults directly, overriding config system newResolvers = getConfiguredResolvers(defaultNameServers) if len(newResolvers) == 0 { msg = "no (valid) dns servers found in configuration or system" log.Criticalf("resolver: %s", msg) - module.Error("no-valid-default-resolvers", msg) - return + module.Error(missingResolversErrorID, msg) } }