TeamPiped-mirror/Piped-Backend
1
0
Fork 0
mirror of https://github.com/TeamPiped/Piped-Backend.git synced 2024-08-14 23:51:41 +00:00
Code Issues Projects Releases Packages Wiki Activity

Give better responses on errors.

Browse source
This commit is contained in:
FireMasterK 2021-06-07 00:15:13 +05:30
parent 2eb424dcae
commit d53459171f
No known key found for this signature in database
GPG key ID: 8DFF5DD33E93DB58
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/me/kavin/piped/ServerLauncher.java
View file

@ -7,11 +7,14 @@ import static io.activej.http.HttpHeaders.CONTENT_TYPE;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.net.InetSocketAddress; import java.net.InetSocketAddress;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.commons.lang3.exception.ExceptionUtils;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.schabi.newpipe.extractor.exceptions.AgeRestrictedContentException;
import org.schabi.newpipe.extractor.exceptions.ContentNotAvailableException;
import org.xml.sax.InputSource; import org.xml.sax.InputSource;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
@ -191,11 +194,15 @@ public class ServerLauncher extends MultithreadedHttpServerLauncher {
private @NotNull HttpResponse getErrorResponse(Exception e) { private @NotNull HttpResponse getErrorResponse(Exception e) {
if (e instanceof ExecutionException)
e = (Exception) e.getCause();
if (!(e instanceof AgeRestrictedContentException || e instanceof ContentNotAvailableException))
e.printStackTrace(); e.printStackTrace();
try { try {
return getJsonResponse(500, return getJsonResponse(500, Constants.mapper
Constants.mapper.writeValueAsBytes(new ErrorResponse(ExceptionUtils.getStackTrace(e))), "private"); .writeValueAsBytes(new ErrorResponse(ExceptionUtils.getStackTrace(e), e.getMessage())), "private");
} catch (JsonProcessingException ex) { } catch (JsonProcessingException ex) {
return HttpResponse.ofCode(500); return HttpResponse.ofCode(500);
} }

5
src/main/java/me/kavin/piped/utils/resp/ErrorResponse.java
View file

@ -2,9 +2,10 @@ package me.kavin.piped.utils.resp;
public class ErrorResponse { public class ErrorResponse {
public final String error; public final String error, message;
public ErrorResponse(String error) { public ErrorResponse(String error, String message) {
this.error = error; this.error = error;
this.message = message;
} }
} }