simpilfy

go-gitea · Nov 16, 2023 · c2d73ff · c2d73ff
1 parent f66e77b
commit c2d73ff
Showing 1 changed file with 8 additions and 6 deletions.
diff --git a/models/system/setting.go b/models/system/setting.go
@@ -115,12 +115,16 @@ func (d *dbConfigCachedGetter) GetValue(ctx context.Context, key string) (v stri
 
 func (d *dbConfigCachedGetter) GetRevision(ctx context.Context) int {
 	d.mu.RLock()
-	defer d.mu.RUnlock()
-	if time.Since(d.cacheTime) < time.Second {
-		return d.revision
-	}
+	cacheTimeDur := time.Since(d.cacheTime)
+	cachedVRevision := d.revision
 	d.mu.RUnlock()
+
+	if cacheTimeDur < time.Second {
+		return cachedVRevision
+	}
+
 	d.mu.Lock()
+	defer d.mu.Unlock()
 	if GetRevision(ctx) != d.revision {
 		rev, set, err := GetAllSettings(ctx)
 		if err != nil {
@@ -131,8 +135,6 @@ func (d *dbConfigCachedGetter) GetRevision(ctx context.Context) int {
 		}
 	}
 	d.cacheTime = time.Now()
-	d.mu.Unlock()
-	d.mu.RLock()
 	return d.revision
 }