Eating BrokenPipeExceptions from CDR views and errors related to jsp streams already having closed. Reducing logging when the attempt to get FOXML for the full record page times out. Deleted extra ErrorController.

Author: bbpennel

access-common/src/main/java/edu/unc/lib/dl/ui/controller/ErrorController.java

@@ -15,6 +15,8 @@
  */
 package edu.unc.lib.dl.ui.controller;
 
+import java.net.SocketException;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -29,30 +31,37 @@
  * @author bbpennel
  */
 @Controller
-public class ErrorController {	
+public class ErrorController {
 	private static final Logger LOG = LoggerFactory.getLogger(ErrorController.class);
-	
+
 	@RequestMapping("/403")
-    public String handle403(Model model, HttpServletRequest request, HttpServletResponse response) {
+	public String handle403(Model model, HttpServletRequest request, HttpServletResponse response) {
 		response.setStatus(HttpServletResponse.SC_FORBIDDEN);
 		model.addAttribute("pageSubtitle", "Error");
-        return "error/403";
-    }
-	
+		return "error/403";
+	}
+
 	@RequestMapping("/404")
-    public String handle404(Model model, HttpServletResponse response) {
+	public String handle404(Model model, HttpServletResponse response) {
 		LOG.debug("Page not found, forwarding to 404 page");
 		response.setStatus(HttpServletResponse.SC_NOT_FOUND);
 		model.addAttribute("pageSubtitle", "Page not found");
-        return "error/404";
-    }
+		return "error/404";
+	}
 
 	@RequestMapping("/exception")
-    public String handleException(Model model, HttpServletRequest request, HttpServletResponse response) {
+	public String handleException(Model model, HttpServletRequest request, HttpServletResponse response) {
 		response.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
 		Throwable throwable = (Throwable) request.getAttribute("javax.servlet.error.exception");
-		LOG.error("An uncaught exception occurred at " + request.getAttribute("javax.servlet.forward.request_uri"), throwable);
+		
+		if (throwable.getCause() instanceof SocketException || throwable instanceof IllegalStateException) {
+			LOG.debug("Connection aborted for {}", request.getAttribute("javax.servlet.forward.request_uri"), throwable);
+		} else {
+			LOG.error("An uncaught exception occurred at " + request.getAttribute("javax.servlet.forward.request_uri"),
+					throwable);
+		}
+		
 		model.addAttribute("pageSubtitle", "Error");
-        return "error/exception";
-    }
+		return "error/exception";
+	}
 }

access/src/main/java/edu/unc/lib/dl/ui/controller/ErrorController.java

@@ -18,6 +18,7 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.concurrent.TimeoutException;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -41,6 +42,7 @@
 import edu.unc.lib.dl.fedora.FedoraDataService;
 import edu.unc.lib.dl.fedora.FedoraException;
 import edu.unc.lib.dl.fedora.NotFoundException;
+import edu.unc.lib.dl.fedora.ServiceException;
 import edu.unc.lib.dl.search.solr.model.BriefObjectMetadataBean;
 import edu.unc.lib.dl.search.solr.model.SearchResultResponse;
 import edu.unc.lib.dl.search.solr.model.SimpleIdRequest;
@@ -129,6 +131,13 @@ public String getFullRecord(String pid, Model model, HttpServletRequest request)
 				LOG.error("Failed to render full record view for " + idRequest.getId(), e);
 			} catch (RenderViewException e) {
 				LOG.error("Failed to render full record view for " + idRequest.getId(), e);
+			} catch (ServiceException e) {
+				if (e.getCause() instanceof TimeoutException) {
+					LOG.warn("Maximum retrieval time exceeded while retrieving FOXML for full record of {}",
+							idRequest.getId());
+				} else {
+					LOG.error("Failed to retrieve FOXML for object {}" , idRequest.getId(), e);
+				}
 			}
 		}