ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

world controller: return service unavailable if world list isn't loaded

Browse Source
This commit is contained in:
Adam
2020-03-26 10:42:54 -04:00
parent 09c5a1d951
commit b0a7e779be
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
http-service/src/main/java/net/runelite/http/service/worlds/WorldController.java
View File

@@ -29,6 +29,7 @@ import java.util.concurrent.TimeUnit;
import net.runelite.http.api.worlds.WorldResult; import net.runelite.http.api.worlds.WorldResult;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.CacheControl; import org.springframework.http.CacheControl;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
@@ -45,8 +46,15 @@ public class WorldController
private WorldResult worldResult; private WorldResult worldResult;
@GetMapping @GetMapping
public ResponseEntity<WorldResult> listWorlds() throws IOException public ResponseEntity<WorldResult> listWorlds()
{ {
if (worldResult == null)
{
return ResponseEntity.status(HttpStatus.SERVICE_UNAVAILABLE)
.cacheControl(CacheControl.noCache())
.build();
}
return ResponseEntity.ok() return ResponseEntity.ok()
.cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic()) .cacheControl(CacheControl.maxAge(10, TimeUnit.MINUTES).cachePublic())
.body(worldResult); .body(worldResult);