From 4740268af0ca3bb30f9cc93bc73f1461e851a827 Mon Sep 17 00:00:00 2001 From: Zoltan Papp Date: Wed, 1 Nov 2023 18:22:22 +0100 Subject: [PATCH] Fix log --- client/internal/dns/file_linux.go | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/client/internal/dns/file_linux.go b/client/internal/dns/file_linux.go index c91c886285a..d4e5d8eb1f6 100644 --- a/client/internal/dns/file_linux.go +++ b/client/internal/dns/file_linux.go @@ -220,29 +220,37 @@ func mergeSearchDomains(searchDomains []string, originalSearchDomains []string) searchDomainsList := make([]string, 0, len(searchDomains)+len(originalSearchDomains)) for _, sd := range searchDomains { - charsNumber += 1 + len(sd) + tmpCharsNumber := charsNumber + 1 + len(sd) if charsNumber > fileMaxLineCharsLimit { - log.Infof("search list line is larger than %d characters. Skip to append more domains", fileMaxLineCharsLimit) - return searchDomainsList + // lets log all skipped domains + log.Infof("search list line is larger than %d characters. Skipping append of %s domain", fileMaxLineCharsLimit, sd) + continue } + charsNumber = tmpCharsNumber + if len(searchDomains)+1 > fileMaxNumberOfSearchDomains { - log.Infof("size of search list is larger than %d. Skip to append more domains", fileMaxNumberOfSearchDomains) - return searchDomainsList + // lets log all skipped domains + log.Infof("already appended %d domains to search list. Skipping append of %s domain", fileMaxNumberOfSearchDomains, sd) + continue } searchDomainsList = append(searchDomainsList, sd) } for _, sd := range originalSearchDomains { - charsNumber += 1 + len(sd) + tmpCharsNumber := charsNumber + 1 + len(sd) if charsNumber > fileMaxLineCharsLimit { - log.Infof("search list line is larger than %d characters. Skip to append more domains", fileMaxLineCharsLimit) - return searchDomainsList + // lets log all skipped domains + log.Infof("search list line is larger than %d characters. Skipping append of %s domain", fileMaxLineCharsLimit, sd) + continue } + charsNumber = tmpCharsNumber + if len(searchDomains)+1 > fileMaxNumberOfSearchDomains { - log.Infof("size of search list is larger than %d. Skip to append more domains", fileMaxNumberOfSearchDomains) - return searchDomainsList + // lets log all skipped domains + log.Infof("already appended %d domains to search list. Skipping append of %s domain", fileMaxNumberOfSearchDomains, sd) + continue } searchDomainsList = append(searchDomainsList, sd)