Home Explore Help
Sign In
compsci-industry
/
TechEmpower.FrameworkBenchmarks
mirror of https://github.com/TechEmpower/FrameworkBenchmarks.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

servlet3-cass: include jstl runtime in WAR; improve error handling

marko asplund 11 years ago
parent
13457afce6
commit
bb969895a6
4 changed files with 36 additions and 8 deletions
Unified View Show Diff Stats
  1. 7 1
      servlet3-cass/pom.xml
  2. 9 5
      servlet3-cass/src/main/java/fi/markoa/tfb/servlet3/DatabaseBaseServlet.java
  3. 3 2
      servlet3-cass/src/main/java/fi/markoa/tfb/servlet3/DatabaseUpdatesServlet.java
  4. 17 0
      servlet3-cass/src/main/webapp/jsp/error.jsp

+ 7 - 1
servlet3-cass/pom.xml
View File 

@@ -12,7 +12,6 @@
 
 
 
         <slf4j.version>1.7.7</slf4j.version>
 
         <slf4j.version>1.7.7</slf4j.version>
 
         <logback.version>1.1.2</logback.version>
 
         <logback.version>1.1.2</logback.version>
 
-        <jersey.version>2.10</jersey.version>
 
     </properties>
 
     </properties>
 
 
 
     <build>
 
     <build>
 
@@ -53,6 +52,13 @@
 
             <scope>provided</scope>
 
             <scope>provided</scope>
 
         </dependency>
 
         </dependency>
 
 
 
+        <dependency>
 
+            <groupId>javax.servlet</groupId>
 
+            <artifactId>jstl</artifactId>
 
+            <version>1.2</version>
 
+            <scope>runtime</scope>
 
+        </dependency>
 
+
 
         <dependency>
 
         <dependency>
 
             <groupId>com.fasterxml.jackson.core</groupId>
 
             <groupId>com.fasterxml.jackson.core</groupId>
 
             <artifactId>jackson-databind</artifactId>
 
             <artifactId>jackson-databind</artifactId>

+ 9 - 5
servlet3-cass/src/main/java/fi/markoa/tfb/servlet3/DatabaseBaseServlet.java
View File 

@@ -9,6 +9,7 @@ import javax.servlet.AsyncContext;
 
 import javax.servlet.ServletConfig;
 
 import javax.servlet.ServletConfig;
 
 import javax.servlet.ServletException;
 
 import javax.servlet.ServletException;
 
 import javax.servlet.http.HttpServlet;
 
 import javax.servlet.http.HttpServlet;
 
+import javax.servlet.http.HttpServletResponse;
 
 import java.io.IOException;
 
 import java.io.IOException;
 
 import java.util.ArrayList;
 
 import java.util.ArrayList;
 
 import java.util.List;
 
 import java.util.List;
 
@@ -53,21 +54,24 @@ public abstract class DatabaseBaseServlet extends HttpServlet {
 
           mapper.writeValue(asyncContext.getResponse().getOutputStream(), world);
 
           mapper.writeValue(asyncContext.getResponse().getOutputStream(), world);
 
         } catch (IOException ex) {
 
         } catch (IOException ex) {
 
           LOGGER.error("failed to get output stream", ex);
 
           LOGGER.error("failed to get output stream", ex);
 
-          throw new RuntimeException("failed to get output stream", ex);
 
         }
 
         }
 
         asyncContext.complete();
 
         asyncContext.complete();
 
       }
 
       }
 
 
 
       @Override
 
       @Override
 
       public void onFailure(Throwable th) {
 
       public void onFailure(Throwable th) {
 
-        // TODO
 
-        LOGGER.error("failed to get data, "+th);
 
-        asyncContext.complete();
 
-        throw new RuntimeException(th);
 
+        LOGGER.error("failed to read data", th);
 
+        errorDispatch(asyncContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "failed to read data: "+th.getMessage());
 
       }
 
       }
 
     }, executor);
 
     }, executor);
 
   }
 
   }
 
 
 
+  protected void errorDispatch(AsyncContext asyncContext, int statusCode, String message) {
 
+    asyncContext.getRequest().setAttribute("statusCode", statusCode);
 
+    asyncContext.getRequest().setAttribute("message", message);
 
+    asyncContext.dispatch("/jsp/error.jsp");
 
+  }
 
+
 
   protected int getQueries(String queries) {
 
   protected int getQueries(String queries) {
 
     int q;
 
     int q;
 
     if(queries == null) {
 
     if(queries == null) {

+ 3 - 2
servlet3-cass/src/main/java/fi/markoa/tfb/servlet3/DatabaseUpdatesServlet.java
View File 

@@ -47,7 +47,8 @@ public class DatabaseUpdatesServlet extends DatabaseBaseServlet {
 
           newRandoms = newRandomsFuture.get();
 
           newRandoms = newRandomsFuture.get();
 
         } catch (InterruptedException | ExecutionException ex) {
 
         } catch (InterruptedException | ExecutionException ex) {
 
           LOGGER.error("failed to generate random numbers", ex);
 
           LOGGER.error("failed to generate random numbers", ex);
 
-          throw new RuntimeException("failed to generate random numbers", ex);
 
+          errorDispatch(asyncContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "failed to generate random numbers"+ex.getMessage());
 
+          return;
 
         }
 
         }
 
         List<World> newWorlds = new ArrayList<>();
 
         List<World> newWorlds = new ArrayList<>();
 
         for(int i = 0; i < worlds.size(); i++)
 
         for(int i = 0; i < worlds.size(); i++)
 
@@ -58,7 +59,6 @@ public class DatabaseUpdatesServlet extends DatabaseBaseServlet {
 
           mapper.writeValue(asyncContext.getResponse().getOutputStream(), newWorlds);
 
           mapper.writeValue(asyncContext.getResponse().getOutputStream(), newWorlds);
 
         } catch (IOException ex) {
 
         } catch (IOException ex) {
 
           LOGGER.error("failed to get output stream", ex);
 
           LOGGER.error("failed to get output stream", ex);
 
-          throw new RuntimeException("failed to get output stream", ex);
 
         }
 
         }
 
         asyncContext.complete();
 
         asyncContext.complete();
 
 
 
@@ -68,6 +68,7 @@ public class DatabaseUpdatesServlet extends DatabaseBaseServlet {
 
       @Override
 
       @Override
 
       public void onFailure(Throwable th) {
 
       public void onFailure(Throwable th) {
 
         LOGGER.error("update failed", th);
 
         LOGGER.error("update failed", th);
 
+        errorDispatch(asyncContext, HttpServletResponse.SC_INTERNAL_SERVER_ERROR, "update failed: "+th.getMessage());
 
       }
 
       }
 
     }, executorService);
 
     }, executorService);

+ 17 - 0
servlet3-cass/src/main/webapp/jsp/error.jsp
View File 

@@ -0,0 +1,17 @@
 
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 
+<%@ page session="false" %>
 
+<%
 
+    if(request.getAttribute("statusCode") != null)
 
+        response.setStatus((Integer)request.getAttribute("statusCode"));
 
+    else
 
+        response.setStatus(500);
 
+%>
 
+<html>
 
+<head>
 
+<title>error</title>
 
+</head>
 
+<body>
 
+<h1>error</h1>
 
+${message}
 
+</body>
 
+</html>