0.2.79 - Slow api fixes

server/internal/api/features.go

@@ -195,16 +195,21 @@ func evaluateFeature(policy store.FeaturePolicy, definition featureDefinition, p
 	return evaluatedFeature{featureDefinition: definition, Enabled: enabled, Source: source, Compatible: compatible}
 }
 
+// currentFeaturePolicy is read on the request path from sixteen places and by the status
+// poll every open television makes, so it is cached rather than queried — see
+// featurePolicyCache for how long and why that is safe.
 func (s *Server) currentFeaturePolicy(ctx context.Context) store.FeaturePolicy {
 	if s.store == nil {
 		return store.DefaultFeaturePolicy()
 	}
-	policy, err := s.store.FeaturePolicy(ctx)
-	if err != nil {
-		s.loggerFor(ctx).Warn("feature policy unavailable; using safe defaults", "error", err)
-		return store.DefaultFeaturePolicy()
-	}
-	return policy
+	return s.featurePolicy.read(ctx, func(ctx context.Context) store.FeaturePolicy {
+		policy, err := s.store.FeaturePolicy(ctx)
+		if err != nil {
+			s.loggerFor(ctx).Warn("feature policy unavailable; using safe defaults", "error", err)
+			return store.DefaultFeaturePolicy()
+		}
+		return policy
+	})
 }
 
 func (s *Server) featureEnabled(ctx context.Context, key string) bool {
@@ -296,6 +301,7 @@ func (s *Server) handleAdminFeaturePolicy(w http.ResponseWriter, r *http.Request
 		writeError(w, http.StatusBadRequest, "unknown feature policy action")
 		return
 	}
+	s.featurePolicy.invalidate()
 	stored, err := s.store.SetFeaturePolicy(r.Context(), next, req.ExpectedRevision)
 	if err != nil {
 		if errors.Is(err, store.ErrFeaturePolicyConflict) {