Author: toad
Date: 2009-04-24 00:37:02 +0000 (Fri, 24 Apr 2009)
New Revision: 27274
Modified:
trunk/freenet/src/freenet/clients/http/FProxyFetchTracker.java
trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
Logging
Modified: trunk/freenet/src/freenet/clients/http/FProxyFetchTracker.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyFetchTracker.java
2009-04-24 00:24:05 UTC (rev 27273)
+++ trunk/freenet/src/freenet/clients/http/FProxyFetchTracker.java
2009-04-24 00:37:02 UTC (rev 27274)
@@ -42,7 +42,7 @@
this.rc = rc;
}
- FProxyFetchWaiter makeFetcher(FreenetURI key, long maxSize) {
+ FProxyFetchWaiter makeFetcher(FreenetURI key, long maxSize) throws
FetchException {
FProxyFetchInProgress progress;
/* LOCKING:
* Call getWaiter() inside the fetchers lock, since we will
purge old
@@ -66,7 +66,9 @@
synchronized(fetchers) {
fetchers.removeElement(key, progress);
}
+ throw e;
}
+ if(logMINOR) Logger.minor(this, "Created new fetcher:
"+progress);
return progress.getWaiter();
// FIXME promote a fetcher when it is re-used
// FIXME get rid of fetchers over some age
Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-04-24
00:24:05 UTC (rev 27273)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java 2009-04-24
00:37:02 UTC (rev 27274)
@@ -503,15 +503,18 @@
while(true) {
fr = fetch.getResult();
if(fr.hasData()) {
+ if(logMINOR) Logger.minor(this, "Found data");
data = fr.data;
mimeType = fr.mimeType;
fetch.close(); // Not waiting any more, but
still locked the results until sent
break;
} else if(fr.failed != null) {
+ if(logMINOR) Logger.minor(this, "Request
failed");
fe = fr.failed;
fetch.close(); // Not waiting any more, but
still locked the results until sent
break;
} else {
+ if(logMINOR) Logger.minor(this, "Still in
progress");
// Still in progress
boolean
isJsEnabled=ctx.getContainer().isFProxyJavascriptEnabled();
HTMLNode pageNode =
ctx.getPageMaker().getPageNode(l10n("fetchingPageTitle"), ctx);
_______________________________________________
cvs mailing list
[email protected]
http://emu.freenetproject.org/cgi-bin/mailman/listinfo/cvs
