Fix merge issues

This commit is contained in:
Vladimir Stoilov 2022-07-21 15:57:45 +02:00
parent b71417dde6
commit bdb4a1a8e8
2 changed files with 4 additions and 3 deletions

View file

@ -43,6 +43,7 @@ var (
systemResolvers []*Resolver // all resolvers that were assigned by the system systemResolvers []*Resolver // all resolvers that were assigned by the system
localScopes []*Scope // list of scopes with a list of local resolvers that can resolve the scope localScopes []*Scope // list of scopes with a list of local resolvers that can resolve the scope
activeResolvers map[string]*Resolver // lookup map of all resolvers activeResolvers map[string]*Resolver // lookup map of all resolvers
currentResolverConfig []string // current active resolver config, to detect changes
resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers resolverInitDomains map[string]struct{} // a set with all domains of the dns resolvers
resolversLock sync.RWMutex resolversLock sync.RWMutex