From e03cc3c19db22c3530fc9315d4e4a9779349704f Mon Sep 17 00:00:00 2001 From: Adam Date: Thu, 26 Mar 2020 10:43:17 -0400 Subject: [PATCH] feed controller: return service unavailable if feed isn't loaded --- .../java/net/runelite/http/service/feed/FeedController.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java b/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java index 66bd8582ce..a35a582d1e 100644 --- a/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java +++ b/http-service/src/main/java/net/runelite/http/service/feed/FeedController.java @@ -38,6 +38,7 @@ import net.runelite.http.service.feed.osrsnews.OSRSNewsService; import net.runelite.http.service.feed.twitter.TwitterService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.CacheControl; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.web.bind.annotation.GetMapping; @@ -122,7 +123,8 @@ public class FeedController { if (memoizedFeed == null) { - return ResponseEntity.notFound() + return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE) + .cacheControl(CacheControl.noCache()) .build(); }