[freenet-cvs] r11180 - trunk/freenet/src/freenet/clients/http

Fri Dec 1 19:33:13 UTC 2006

Author: toad
Date: 2006-12-01 19:33:12 +0000 (Fri, 01 Dec 2006)
New Revision: 11180

Modified:
   trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
Log:
De-emphasize SocketException's, especially "Broken pipe"

Modified: trunk/freenet/src/freenet/clients/http/FProxyToadlet.java
===================================================================

--- trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2006-12-01 19:25:58 UTC (rev 11179)
+++ trunk/freenet/src/freenet/clients/http/FProxyToadlet.java	2006-12-01 19:33:12 UTC (rev 11180)
@@ -7,6 +7,7 @@
 import java.io.StringWriter;
 import java.net.BindException;
 import java.net.MalformedURLException;
+import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.security.MessageDigest;
@@ -424,6 +425,15 @@
 				this.writeReply(ctx, 500 /* close enough - FIXME probably should depend on status code */,
 						"text/html", FetchException.getShortMessage(e.mode), pageBuffer.toString());
 			}
+		} catch (SocketException e) {
+			// Probably irrelevant
+			if(e.getMessage().equals("Broken pipe")) {
+				if(Logger.shouldLog(Logger.MINOR, this))
+					Logger.minor(this, "Caught "+e+" while handling GET", e);
+			} else {
+				Logger.normal(this, "Caught "+e, e);
+			}
+			throw e;
 		} catch (Throwable t) {
 			Logger.error(this, "Caught "+t, t);
 			String msg = "<html><head><title>Internal Error</title></head><body><h1>Internal Error: please report</h1><pre>";


