[Archive-access-cvs] SF.net SVN: archive-access: [2140] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

[<bra...@us...>]

Revision: 2140
          http://archive-access.svn.sourceforge.net/archive-access/?rev=2140&view=rev
Author:   bradtofel
Date:     2008-01-15 15:21:02 -0800 (Tue, 15 Jan 2008)

Log Message:
-----------
FEATURE: reimplemented lost NotInArchive logging.

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-01-15 03:06:37 UTC (rev 2139)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/webapp/AccessPoint.java	2008-01-15 23:21:02 UTC (rev 2140)
@@ -26,6 +26,7 @@
 
 import java.io.IOException;
 import java.util.Properties;
+import java.util.logging.Logger;
 
 import javax.servlet.RequestDispatcher;
 import javax.servlet.ServletException;
@@ -47,6 +48,7 @@
 import org.archive.wayback.exception.AuthenticationControlException;
 import org.archive.wayback.exception.BadQueryException;
 import org.archive.wayback.exception.ResourceNotAvailableException;
+import org.archive.wayback.exception.ResourceNotInArchiveException;
 import org.archive.wayback.exception.WaybackException;
 import org.archive.wayback.util.operator.BooleanOperator;
 import org.springframework.beans.factory.BeanNameAware;
@@ -66,6 +68,9 @@
  */
 public class AccessPoint implements RequestContext, BeanNameAware {
 
+	private static final Logger LOGGER = Logger.getLogger(
+			AccessPoint.class.getName());
+	
 	private boolean useServerName = false;
 	private int contextPort = 0;
 	private String contextName = null;
@@ -309,6 +314,7 @@
 			replay.renderResource(httpRequest, httpResponse, wbRequest,
 					closest, resource, uriConverter, captureResults);
 		} catch(WaybackException e) {
+			logNotInArchive(e,wbRequest);
 			replay.renderException(httpRequest, httpResponse, wbRequest, e);
 		} finally {
 			if(resource != null) {
@@ -337,9 +343,23 @@
 						results,uriConverter);
 			}
 		} catch(WaybackException e) {
+			logNotInArchive(e,wbRequest);
 			query.renderException(httpRequest, httpResponse, wbRequest, e);
 		}
 	}
+	
+	private void logNotInArchive(WaybackException e, WaybackRequest r) {
+		if(e instanceof ResourceNotInArchiveException) {
+			String url = r.get(WaybackConstants.REQUEST_URL);
+			StringBuilder sb = new StringBuilder(100);
+			sb.append("NotInArchive\t");
+			sb.append(contextName).append("\t");
+			sb.append(contextPort).append("\t");
+			sb.append(url);
+			
+			LOGGER.info(sb.toString());
+		}
+	}
 
 	/**
 	 * @param contextPort the contextPort to set


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.