Author: toad
Date: 2008-01-28 17:05:46 +0000 (Mon, 28 Jan 2008)
New Revision: 17367

Modified:
   trunk/freenet/src/freenet/node/RequestHandler.java
   trunk/freenet/src/freenet/node/RequestSender.java
Log:


Modified: trunk/freenet/src/freenet/node/RequestHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestHandler.java  2008-01-28 16:56:15 UTC 
(rev 17366)
+++ trunk/freenet/src/freenet/node/RequestHandler.java  2008-01-28 17:05:46 UTC 
(rev 17367)
@@ -228,7 +228,7 @@
                this.status=status;

                if (now > responseDeadline) {
-                       Logger.error(this, "requestsender took too long to 
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2, 
true)+"/"+rs.getStatus()+")"); 
+                       Logger.error(this, "requestsender took too long to 
respond to requestor ("+TimeUtil.formatTime((now - searchStartTime), 2, 
true)+"/"+rs.getStatusString()+")"); 
                        applyByteCounts();
                        unregisterRequestHandlerWithNode();
                        return;

Modified: trunk/freenet/src/freenet/node/RequestSender.java
===================================================================
--- trunk/freenet/src/freenet/node/RequestSender.java   2008-01-28 16:56:15 UTC 
(rev 17366)
+++ trunk/freenet/src/freenet/node/RequestSender.java   2008-01-28 17:05:46 UTC 
(rev 17367)
@@ -91,6 +91,37 @@
     static final int RECENTLY_FAILED = 9;
     private PeerNode successFrom;

+    static String getStatusString(int status) {
+       switch(status) {
+       case NOT_FINISHED:
+               return "NOT FINISHED";
+       case SUCCESS:
+               return "SUCCESS";
+       case ROUTE_NOT_FOUND:
+               return "ROUTE NOT FOUND";
+       case DATA_NOT_FOUND:
+               return "DATA NOT FOUND";
+       case TRANSFER_FAILED:
+               return "TRANSFER FAILED";
+       case VERIFY_FAILURE:
+               return "VERIFY FAILURE";
+       case TIMED_OUT:
+               return "TIMED OUT";
+       case GENERATED_REJECTED_OVERLOAD:
+               return "GENERATED REJECTED OVERLOAD";
+       case INTERNAL_ERROR:
+               return "INTERNAL ERROR";
+       case RECENTLY_FAILED:
+               return "RECENTLY FAILED";
+       default:
+               return "UNKNOWN STATUS CODE: "+status;
+       }
+    }
+    
+    String getStatusString() {
+       return getStatusString(getStatus());
+    }
+    
     private static boolean logMINOR;

     public String toString() {


Reply via email to