Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-17 15:55:02 +02:00
Code Issues Projects Releases Wiki Activity

Add Exception Handling when an error at the API happens

Browse Source
This commit is contained in:
Fuzzlemann 2017-08-20 02:25:09 +02:00
parent c37b0c8941
commit dcff04b73a
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Plan/src/main/java/com/djrapitops/plan/ui/webserver/WebServer.java
View File

@ -34,6 +34,7 @@ import java.util.*;
import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.ArrayBlockingQueue;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import java.util.zip.GZIPOutputStream; import java.util.zip.GZIPOutputStream;
/** /**
@ -300,23 +301,21 @@ public class WebServer {
return PageCacheHandler.loadPage(error, () -> new BadRequestResponse(error)); return PageCacheHandler.loadPage(error, () -> new BadRequestResponse(error));
} }
return api.onResponse(plan, variables); try {
return api.onResponse(plan, variables);
} catch (Exception ex) {
Log.toLog("WebServer.getAPIResponse", ex);
return new InternalErrorResponse(ex, "An error while processing the request happened");
}
} }
private Map<String, String> readVariables(String response) { private Map<String, String> readVariables(String response) {
Map<String, String> variableMap = new HashMap<>();
String[] variables = response.split("&"); String[] variables = response.split("&");
for (String variable : variables) { return Arrays.stream(variables)
String[] splittedVariables = variable.split("=", 2); .map(variable -> variable.split("=", 2))
if (splittedVariables.length != 2) { .filter(splittedVariables -> splittedVariables.length == 2)
continue; .collect(Collectors.toMap(splittedVariables -> splittedVariables[0], splittedVariables -> splittedVariables[1], (a, b) -> b));
}
variableMap.put(splittedVariables[0], splittedVariables[1]);
}
return variableMap;
} }
private Response getResponse(String target, WebUser user) { private Response getResponse(String target, WebUser user) {

9
Plan/src/main/java/com/djrapitops/plan/ui/webserver/response/InternalErrorResponse.java
View File

@ -9,18 +9,23 @@ import main.java.com.djrapitops.plan.ui.html.Html;
public class InternalErrorResponse extends Response { public class InternalErrorResponse extends Response {
public InternalErrorResponse(Throwable e, String cause) { public InternalErrorResponse(Throwable e, String cause) {
super.setHeader("HTTP/1.1 500 Internal Error");
StringBuilder content = new StringBuilder(); StringBuilder content = new StringBuilder();
super.setHeader("HTTP/1.1 500 Internal Error");
content.append("<h1>500 Internal Error occurred</h1>"); content.append("<h1>500 Internal Error occurred</h1>");
content.append("<p>Please report this issue here: </p>"); content.append("<p>Please report this issue here: </p>");
content.append(Html.LINK.parse("https://github.com/Rsl1122/Plan-PlayerAnalytics/issues", "Issues")); content.append(Html.LINK.parse("https://github.com/Rsl1122/Plan-PlayerAnalytics/issues", "Issues"));
content.append("<p>"); content.append("<p>");
content.append(e).append(" | ").append(cause); content.append(e).append(" | ").append(cause);
for (Object element : e.getStackTrace()) {
for (StackTraceElement element : e.getStackTrace()) {
content.append("<br>"); content.append("<br>");
content.append(" ").append(element); content.append(" ").append(element);
} }
content.append("</p>"); content.append("</p>");
super.setContent(content.toString()); super.setContent(content.toString());
} }
} }