(+semver:patch) only run garbage collection if in memory is false

syncromatics · Oct 13, 2020 · 9009d55 · 9009d55
1 parent aeb2538
commit 9009d55
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/cmd/kvetch/main.go b/cmd/kvetch/main.go
@@ -35,14 +35,16 @@ func main() {
 
 	apiv1.RegisterAPIServer(server, service)
 
-	garbageCollector := services.NewGarbageCollectorService(kvstore, settings.GarbageCollectionInterval)
-
 	ctx, cancel := context.WithCancel(context.Background())
 	group, ctx := errgroup.WithContext(ctx)
 
 	group.Go(grpc.HostServer(ctx, server, settings.Port))
 	group.Go(grpc.HostMetrics(ctx, settings.PrometheusPort))
-	group.Go(garbageCollector.Run(ctx))
+
+	if !settings.KVStoreOptions.InMemory.GetValue() {
+		garbageCollector := services.NewGarbageCollectorService(kvstore, settings.GarbageCollectionInterval)
+		group.Go(garbageCollector.Run(ctx))
+	}
 
 	eventChan := make(chan os.Signal)
 	signal.Notify(eventChan, syscall.SIGINT, syscall.SIGTERM)

diff --git a/cmd/kvetch/settings.go b/cmd/kvetch/settings.go
@@ -30,6 +30,8 @@ func getKVStoreOptions() (*kvstore.KVStoreOptions, error) {
 		} else {
 			kvStoreOptions.InMemory = &wrappers.BoolValue{Value: inMemory}
 		}
+	} else {
+		kvStoreOptions.InMemory = &wrappers.BoolValue{Value: false}
 	}
 	enableTruncateString, ok := os.LookupEnv("ENABLE_TRUNCATE")
 	if ok {