Merge pull request #1331 from scireum/ili/OX-10618

Do not cache help pages, caches help assets longer
scireum · Nov 29, 2023 · 1f69bc4 · 1f69bc4
2 parents 605a91f + 8fafcd7
commit 1f69bc4
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/src/main/java/sirius/web/dispatch/HelpDispatcher.java b/src/main/java/sirius/web/dispatch/HelpDispatcher.java
@@ -34,6 +34,7 @@
 import sirius.web.security.UserContext;
 
 import java.io.IOException;
+import java.time.Duration;
 import java.util.List;
 import java.util.regex.Pattern;
 
@@ -54,6 +55,9 @@ public class HelpDispatcher implements WebDispatcher {
     @ConfigValue("help.languages")
     private List<String> helpSystemLanguageDirectories;
 
+    @ConfigValue("http.response.defaultStaticAssetTTL")
+    private static Duration defaultStaticAssetTTL;
+
     @Part
     private Resources resources;
 
@@ -114,14 +118,16 @@ private DispatchDecision serveAsset(WebContext ctx, String uri) throws IOExcepti
             return DispatchDecision.CONTINUE;
         }
 
-        ctx.respondWith().resource(asset.getUrl().openConnection());
+        ctx.respondWith()
+           .cachedForSeconds((int) defaultStaticAssetTTL.getSeconds())
+           .resource(asset.getUrl().openConnection());
         return DispatchDecision.DONE;
     }
 
     private DispatchDecision serveTopic(WebContext ctx, String uri) {
         Template template = resolveTemplate(uri);
         if (template != null) {
-            ctx.respondWith().cached().template(HttpResponseStatus.OK, template);
+            ctx.respondWith().notCached().template(HttpResponseStatus.OK, template);
             return DispatchDecision.DONE;
         }