diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/org/traccar/api/ResourceErrorHandler.java | 44 | ||||
| -rw-r--r-- | src/org/traccar/web/WebServer.java | 19 |
2 files changed, 63 insertions, 0 deletions
diff --git a/src/org/traccar/api/ResourceErrorHandler.java b/src/org/traccar/api/ResourceErrorHandler.java new file mode 100644 index 000000000..e2f4dce10 --- /dev/null +++ b/src/org/traccar/api/ResourceErrorHandler.java @@ -0,0 +1,44 @@ +/* + * Copyright 2015 Anton Tananaev (anton.tananaev@gmail.com) + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.traccar.api; + +import org.traccar.helper.Log; + +import javax.ws.rs.WebApplicationException; +import javax.ws.rs.core.Response; +import javax.ws.rs.ext.ExceptionMapper; +import java.util.HashMap; +import java.util.Map; + +public class ResourceErrorHandler implements ExceptionMapper<WebApplicationException> { + + private static final String KEY_MESSAGE = "message"; + private static final String KEY_DETAILS = "details"; + + @Override + public Response toResponse(WebApplicationException e) { + Map<String, String> error = new HashMap<>(); + Throwable cause = e.getCause(); + if (cause != null) { + error.put(KEY_MESSAGE, cause.getMessage()); + error.put(KEY_DETAILS, Log.exceptionStack(cause)); + return Response.status(Response.Status.BAD_REQUEST).entity(error).build(); + } else { + return Response.status(e.getResponse().getStatus()).entity(error).build(); + } + } + +} diff --git a/src/org/traccar/web/WebServer.java b/src/org/traccar/web/WebServer.java index d172a5331..63d80a7f3 100644 --- a/src/org/traccar/web/WebServer.java +++ b/src/org/traccar/web/WebServer.java @@ -15,10 +15,18 @@ */ package org.traccar.web; +import java.io.IOException; +import java.io.Writer; import java.net.InetSocketAddress; import javax.naming.InitialContext; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import javax.sql.DataSource; + +import org.eclipse.jetty.http.HttpStatus; +import org.eclipse.jetty.server.Request; import org.eclipse.jetty.server.Server; +import org.eclipse.jetty.server.handler.ErrorHandler; import org.eclipse.jetty.server.handler.HandlerList; import org.eclipse.jetty.server.handler.ResourceHandler; import org.eclipse.jetty.servlet.ServletContextHandler; @@ -28,6 +36,7 @@ import org.glassfish.jersey.server.ResourceConfig; import org.glassfish.jersey.servlet.ServletContainer; import org.traccar.Config; import org.traccar.api.CorsResponseFilter; +import org.traccar.api.ResourceErrorHandler; import org.traccar.api.SecurityRequestFilter; import org.traccar.api.resource.DeviceResource; import org.traccar.api.resource.PositionResource; @@ -76,6 +85,15 @@ public class WebServer { break; } server.setHandler(handlers); + + server.addBean(new ErrorHandler() { + @Override + protected void handleErrorPage( + HttpServletRequest request, Writer writer, int code, String message) throws IOException { + writer.write("<!DOCTYPE<html><head><title>Error</title></head><html><body>" + + code + " - " + HttpStatus.getMessage(code) + "</body></html>"); + } + }); } private void initWebApp() { @@ -108,6 +126,7 @@ public class WebServer { servletHandler.setContextPath("/api"); if (initRest) { ResourceConfig resourceConfig = new ResourceConfig(); + resourceConfig.register(ResourceErrorHandler.class); resourceConfig.register(SecurityRequestFilter.class); resourceConfig.register(CorsResponseFilter.class); resourceConfig.registerClasses(ServerResource.class, SessionResource.class, |