Revision: 2633 http://archive-access.svn.sourceforge.net/archive-access/?rev=2633&view=rev Author: bradtofel Date: 2008-11-07 00:44:24 +0000 (Fri, 07 Nov 2008) Log Message: ----------- TWEAK: made static xform methods public. Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2008-11-06 22:54:01 UTC (rev 2632) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2008-11-07 00:44:24 UTC (rev 2633) @@ -94,7 +94,7 @@ || name.endsWith(ArcWarcFilenameFilter.WARC_GZ_SUFFIX)); } - private static Resource ARCArchiveRecordToResource(ArchiveRecord rec, + public static Resource ARCArchiveRecordToResource(ArchiveRecord rec, ARCReader reader) throws ResourceNotAvailableException, IOException { if (!(rec instanceof ARCRecord)) { @@ -105,7 +105,7 @@ return ar; } - private static Resource WARCArchiveRecordToResource(ArchiveRecord rec, + public static Resource WARCArchiveRecordToResource(ArchiveRecord rec, WARCReader reader) throws ResourceNotAvailableException, IOException { if (!(rec instanceof WARCRecord)) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3467 http://archive-access.svn.sourceforge.net/archive-access/?rev=3467&view=rev Author: bradtofel Date: 2011-06-16 16:41:19 +0000 (Thu, 16 Jun 2011) Log Message: ----------- FEATURE: added performance logging of HTTP 1.1 resource requests Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2011-06-16 16:39:40 UTC (rev 3466) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2011-06-16 16:41:19 UTC (rev 3467) @@ -36,6 +36,7 @@ import org.archive.io.warc.WARCRecord; import org.archive.wayback.core.Resource; import org.archive.wayback.exception.ResourceNotAvailableException; +import org.archive.wayback.webapp.PerformanceLogger; /** * Static factory class for constructing ARC/WARC Resources from @@ -89,6 +90,7 @@ Resource r = null; // TODO: allow configuration of timeouts -- now using defaults.. + long start = System.currentTimeMillis(); TimeoutArchiveReaderFactory tarf = new TimeoutArchiveReaderFactory(); ArchiveReader reader = tarf.getArchiveReader(url,offset); if(reader instanceof ARCReader) { @@ -102,6 +104,8 @@ } else { throw new ResourceNotAvailableException("Unknown ArchiveReader"); } + long elapsed = System.currentTimeMillis() - start; + PerformanceLogger.noteElapsed("Http11Resource", elapsed, url.toExternalForm()); return r; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
Revision: 3516 http://archive-access.svn.sourceforge.net/archive-access/?rev=3516&view=rev Author: bradtofel Date: 2011-09-06 03:49:28 +0000 (Tue, 06 Sep 2011) Log Message: ----------- LOGGING Modified Paths: -------------- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java =================================================================== --- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2011-09-06 03:48:39 UTC (rev 3515) +++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/resourcestore/resourcefile/ResourceFactory.java 2011-09-06 03:49:28 UTC (rev 3516) @@ -25,6 +25,7 @@ import java.io.InputStream; import java.io.RandomAccessFile; import java.net.URL; +import java.util.logging.Logger; import org.archive.io.ArchiveReader; import org.archive.io.ArchiveRecord; @@ -46,14 +47,25 @@ * @version $Date$, $Revision$ */ public class ResourceFactory { + private static final Logger LOGGER = + Logger.getLogger(ResourceFactory.class.getName()); public static Resource getResource(String urlOrPath, long offset) throws IOException, ResourceNotAvailableException { - if(urlOrPath.startsWith("http://")) { - return getResource(new URL(urlOrPath), offset); - } else { - // assume local path: - return getResource(new File(urlOrPath), offset); + LOGGER.info("Fetching: " + urlOrPath + " : " + offset); + try { + if(urlOrPath.startsWith("http://")) { + return getResource(new URL(urlOrPath), offset); + } else { + // assume local path: + return getResource(new File(urlOrPath), offset); + } + } catch(ResourceNotAvailableException e) { + LOGGER.warning("ResourceNotAvailable for " + urlOrPath + " " + e.getMessage()); + throw e; + } catch(IOException e) { + LOGGER.warning("ResourceNotAvailable for " + urlOrPath + " " + e.getMessage()); + throw e; } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |