Author: toad
Date: 2008-03-20 14:41:04 +0000 (Thu, 20 Mar 2008)
New Revision: 18637
Modified:
trunk/freenet/src/freenet/node/RequestHandler.java
trunk/freenet/src/freenet/node/RequestSender.java
Log:
Logging: downgrade the transfer failures to NORMAL for now, since a certain
number of them are inevitable and we have statistics to look at now.
Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java 2008-03-20 14:19:29 UTC
(rev 18636)
+++ trunk/freenet/src/freenet/node/RequestHandler.java 2008-03-20 14:41:04 UTC
(rev 18637)
@@ -240,7 +240,8 @@
// Offer the data if there is any.
node.failureTable.onFinalFailure(key, null, htl, -1,
source);
PeerNode routedLast = rs == null ? null :
rs.routedLast();
- Logger.error(this, "requestsender took too long to
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2,
true)+"/"+(rs == null ? "null" : rs.getStatusString())+") routed to
"+(routedLast == null ? "null" : routedLast.shortToString()));
+ // A certain number of these are normal.
+ Logger.normal(this, "requestsender took too long to
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2,
true)+"/"+(rs == null ? "null" : rs.getStatusString())+") routed to
"+(routedLast == null ? "null" : routedLast.shortToString()));
applyByteCounts();
unregisterRequestHandlerWithNode();
return;
Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java 2008-03-20 14:19:29 UTC
(rev 18636)
+++ trunk/freenet/src/freenet/node/RequestSender.java 2008-03-20 14:41:04 UTC
(rev 18637)
@@ -286,7 +286,8 @@
if
(e.getReason()==RetrievalException.SENDER_DISCONNECTED)
Logger.normal(this, "Transfer failed (disconnect): "+e, e);
else
-
Logger.error(this, "Transfer for offer failed
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e+"
from "+pn, e);
+ // A certain
number of these are normal, it's better to track them through statistics than
call attention to them in the logs.
+
Logger.normal(this, "Transfer for offer failed
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e+"
from "+pn, e);
finish(GET_OFFER_TRANSFER_FAILED, pn,
true);
pn.transferFailed("RequestSenderGetOfferedTransferFailed");
offers.deleteLastOffer();
@@ -784,7 +785,8 @@
if
(e.getReason()==RetrievalException.SENDER_DISCONNECTED)
Logger.normal(this, "Transfer failed (disconnect): "+e, e);
else
-
Logger.error(this, "Transfer failed
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e+"
from "+next, e);
+ // A certain
number of these are normal, it's better to track them through statistics than
call attention to them in the logs.
+
Logger.normal(this, "Transfer failed
("+e.getReason()+"/"+RetrievalException.getErrString(e.getReason())+"): "+e+"
from "+next, e);
next.localRejectedOverload("TransferFailedRequest"+e.getReason());
finish(TRANSFER_FAILED, next, false);
node.failureTable.onFinalFailure(key,
next, htl, FailureTable.REJECT_TIME, source);
