Fix review

moira-alert · Apr 24, 2024 · 27dec5e · 27dec5e
1 parent 7b707ab
commit 27dec5e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 12 deletions.
diff --git a/cmd/filter/config.go b/cmd/filter/config.go
@@ -47,12 +47,13 @@ func getDefault() config {
 			LogPrettyFormat: false,
 		},
 		Filter: filterConfig{
-			Listen:               ":2003",
-			RetentionConfig:      "/etc/moira/storage-schemas.conf",
-			CacheCapacity:        10, //nolint
-			MaxParallelMatches:   0,
-			PatternsUpdatePeriod: "1s",
-			DropMetricsTTL:       "1h",
+			Listen:                 ":2003",
+			RetentionConfig:        "/etc/moira/storage-schemas.conf",
+			CacheCapacity:          10, //nolint
+			MaxParallelMatches:     0,
+			PatternsUpdatePeriod:   "1s",
+			DropMetricsTTL:         "1h",
+			BatchForcedSaveTimeout: "1s",
 			Compatibility: compatibility{
 				AllowRegexLooseStartMatch: false,
 				AllowRegexMatchEmpty:      true,

diff --git a/cmd/filter/main.go b/cmd/filter/main.go
@@ -7,7 +7,6 @@ import (
 	"os/signal"
 	"runtime"
 	"syscall"
-	"time"
 
 	"github.com/moira-alert/moira"
 	"github.com/moira-alert/moira/cmd"
@@ -144,12 +143,7 @@ func main() {
 
 	// Start metrics matcher
 	cacheCapacity := config.Filter.CacheCapacity
-
 	batchForcedSaveTimeout := to.Duration(config.Filter.BatchForcedSaveTimeout)
-	if batchForcedSaveTimeout == 0 {
-		batchForcedSaveTimeout = time.Second
-	}
-
 	metricsMatcher := matchedmetrics.NewMetricsMatcher(filterMetrics, logger, database, cacheStorage, cacheCapacity, batchForcedSaveTimeout)
 	metricsMatcher.Start(metricsChan)
 	defer metricsMatcher.Wait()  // First stop listener