fix changelog

CHANGELOG.md

@@ -25,11 +25,10 @@ NOTE: Add new changes BELOW THIS COMMENT.
 
 ### Added
 
+- The ability to disable statistics by using the new `statistics.enable` field.
 - The ability to exclude domain names from the query log or statistics by using
   the new `querylog.ignored` or `statistics.ignored` fields ([#1717], [#4299]).
 
-- The ability to disable statistics by using the new `statistics.enable` field.
-
 ### Changed
 
 #### Configuration Changes

internal/home/config.go

@@ -486,11 +486,11 @@ func (c *configuration) write() (err error) {
 	}
 
 	if Context.stats != nil {
-		sdc := stats.Config{}
-		Context.stats.WriteDiskConfig(&sdc)
-		config.Stats.Interval = atomic.LoadUint32(&sdc.LimitDays)
-		config.Stats.Enabled = sdc.Enabled
-		config.Stats.Ignored = sdc.Ignored.Values()
+		statsConf := stats.Config{}
+		Context.stats.WriteDiskConfig(&statsConf)
+		config.Stats.Interval = atomic.LoadUint32(&statsConf.LimitDays)
+		config.Stats.Enabled = statsConf.Enabled
+		config.Stats.Ignored = statsConf.Ignored.Values()
 		sort.Strings(config.Stats.Ignored)
 	}
 

internal/home/dns.go

@@ -57,16 +57,14 @@ func initDNS() (err error) {
 		ConfigModified: onConfigModified,
 		HTTPRegister:   httpRegister,
 		Enabled:        config.Stats.Enabled,
-		Ignored:        stringutil.NewSet(),
 	}
-	for _, v := range config.Stats.Ignored {
-		host := strings.ToLower(strings.TrimSuffix(v, "."))
-		if statsConf.Ignored.Has(host) {
-			return fmt.Errorf("statistics: duplicate ignored host %s", host)
-		}
 
-		statsConf.Ignored.Add(host)
+	set, err := nonDupEmptyHostNames(config.Stats.Ignored)
+	if err != nil {
+		return fmt.Errorf("statistics: ignored list: %w", err)
 	}
+
+	statsConf.Ignored = set
 	Context.stats, err = stats.New(statsConf)
 	if err != nil {
 		return fmt.Errorf("init stats: %w", err)
@@ -83,16 +81,14 @@ func initDNS() (err error) {
 		MemSize:           config.QueryLog.MemSize,
 		Enabled:           config.QueryLog.Enabled,
 		FileEnabled:       config.QueryLog.FileEnabled,
-		Ignored:           stringutil.NewSet(),
 	}
-	for _, v := range config.QueryLog.Ignored {
-		host := strings.ToLower(strings.TrimSuffix(v, "."))
-		if conf.Ignored.Has(host) {
-			return fmt.Errorf("querylog: duplicate ignored host %s", host)
-		}
 
-		conf.Ignored.Add(host)
+	set, err = nonDupEmptyHostNames(config.QueryLog.Ignored)
+	if err != nil {
+		return fmt.Errorf("querylog: ignored list %w", err)
 	}
+
+	conf.Ignored = set
 	Context.queryLog = querylog.New(conf)
 
 	Context.filters, err = filtering.New(config.DNS.DnsfilterConf, nil)
@@ -536,3 +532,25 @@ func closeDNSServer() {
 
 	log.Debug("all dns modules are closed")
 }
+
+// nonDupEmptyHostNames returns nil and error, if list has duplicate or empty
+// host name.  Otherwise returns a set, which contains lowercase host names
+// without dot at the end, and nil error.
+func nonDupEmptyHostNames(list []string) (set *stringutil.Set, err error) {
+	set = stringutil.NewSet()
+
+	for _, v := range list {
+		host := strings.ToLower(strings.TrimSuffix(v, "."))
+		if host == "" {
+			return nil, errors.Error("host name is empty")
+		}
+
+		if set.Has(host) {
+			return nil, fmt.Errorf("duplicate host name %q", host)
+		}
+
+		set.Add(host)
+	}
+
+	return set, nil
+}

internal/home/upgrade.go

@@ -887,6 +887,9 @@ func upgradeSchema15to16(diskConf yobj) (err error) {
 	k := "statistics_interval"
 	v, has := dns[k]
 	if has {
+		if v == 0 {
+			stats["enabled"] = false
+		}
 		stats["interval"] = v
 	}
 	delete(dns, k)

internal/home/upgrade_test.go

@@ -720,6 +720,22 @@ func TestUpgradeSchema15to16(t *testing.T) {
 		},
 		want: defaultWantObj,
 		name: "default_values",
+	}, {
+		in: yobj{
+			"dns": map[string]any{
+				"statistics_interval": 0,
+			},
+		},
+		want: yobj{
+			"statistics": map[string]any{
+				"enabled":  false,
+				"interval": 0,
+				"ignored":  []any{},
+			},
+			"dns":            map[string]any{},
+			"schema_version": newSchemaVer,
+		},
+		name: "stats_disabled",
 	}}
 
 	for _, tc := range testCases {

internal/stats/stats.go

@@ -427,6 +427,7 @@ func (s *StatsCtx) setLimit(limitDays int) {
 		s.enabled = true
 		atomic.StoreUint32(&s.limitHours, uint32(24*limitDays))
 		log.Debug("stats: set limit: %d days", limitDays)
+
 		return
 	}
 

internal/stats/unit.go

@@ -346,10 +346,9 @@ func topsCollector(units []*unitDB, max int, ignored *stringutil.Set, pg pairsGe
 	m := map[string]uint64{}
 	for _, u := range units {
 		for _, cp := range pg(u) {
-			if ignored.Has(cp.Name) {
-				continue
+			if !ignored.Has(cp.Name) {
+				m[cp.Name] += cp.Count
 			}
-			m[cp.Name] += cp.Count
 		}
 	}
 	a2 := convertMapToSlice(m, max)