Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-09 12:20:36 +01:00
Code Issues Projects Releases Wiki Activity

Further fixes to prevent the 404 message returned from cache even when bukkit servers are online #412

Browse Source
This commit is contained in:
Rsl1122 2017-11-28 17:05:41 +02:00
parent a84b470be5
commit 9c045b7b0b
3 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Plan/src/main/java/com/djrapitops/plan/systems/info/BungeeInformationManager.java
View File

@ -174,6 +174,8 @@ public class BungeeInformationManager extends InformationManager {
try {
getWebAPI().getAPI(IsOnlineWebAPI.class).sendRequest(server.getWebAddress(), uuid);
return server;
} catch (WebAPIConnectionFailException e) {
serverInfoManager.serverHasGoneOffline(server.getUuid());
} catch (WebAPINotFoundException ignored) {
/*continue*/
} catch (WebAPIException e) {
@ -182,7 +184,7 @@ public class BungeeInformationManager extends InformationManager {
}
}
Optional<ServerInfo> bukkitServer = onlineServers.stream().findAny();
Optional<ServerInfo> bukkitServer = serverInfoManager.getOnlineBukkitServers().stream().findAny();
if (bukkitServer.isPresent()) {
return bukkitServer.get();
}

1
Plan/src/main/java/com/djrapitops/plan/systems/info/server/BungeeServerInfoManager.java
View File

@ -148,6 +148,7 @@ public class BungeeServerInfoManager {
@Override
public void run() {
sendConfigSettings(serverUUID);
connectedToServer(bukkitServers.get(serverUUID));
this.cancel();
}
}).runTaskLaterAsynchronously(TimeAmount.SECOND.ticks() * 3L);

7
Plan/src/main/java/com/djrapitops/plan/systems/webserver/ResponseHandler.java
View File

@ -207,7 +207,12 @@ public class ResponseHandler extends APIResponseHandler {
}
plugin.getInfoManager().cachePlayer(uuid);
return PageCache.loadPage("inspectPage: " + uuid, () -> new InspectPageResponse(plugin.getInfoManager(), uuid));
Response response = PageCache.loadPage("inspectPage: " + uuid);
if (response == null || response instanceof NotFoundResponse) {
PageCache.cachePage("inspectPage: " + uuid, () -> new InspectPageResponse(plugin.getInfoManager(), uuid));
response = PageCache.loadPage("inspectPage: " + uuid);
}
return response;
}
private Response notFoundResponse() {