cachevalue: simplify exported interface (#19137)

- Also add cache options type
2024-02-28 09:09:09 -08:00
parent 2bdb9511bd
commit 62ce52c8fd
10 changed files with 98 additions and 103 deletions
@@ -77,13 +77,10 @@ func loadPrefixUsageFromBackend(ctx context.Context, objAPI ObjectLayer, bucket

 	cache := dataUsageCache{}

-	prefixUsageCache.Once.Do(func() {
-		prefixUsageCache.TTL = 30 * time.Second
-
+	prefixUsageCache.InitOnce(30*time.Second,
 		// No need to fail upon Update() error, fallback to old value.
-		prefixUsageCache.ReturnLastGood = true
-		prefixUsageCache.NoWait = true
-		prefixUsageCache.Update = func() (map[string]uint64, error) {
+		cachevalue.Opts{ReturnLastGood: true, NoWait: true},
+		func() (map[string]uint64, error) {
 			m := make(map[string]uint64)
 			for _, pool := range z.serverPools {
 				for _, er := range pool.sets {
@@ -108,8 +105,8 @@ func loadPrefixUsageFromBackend(ctx context.Context, objAPI ObjectLayer, bucket
 				}
 			}
 			return m, nil
-		}
-	})
+		},
+	)

 	return prefixUsageCache.Get()
 }