Author: toad
Date: 2006-01-26 21:09:43 +0000 (Thu, 26 Jan 2006)
New Revision: 7939
Modified:
trunk/freenet/src/freenet/client/FetchException.java
trunk/freenet/src/freenet/client/InserterException.java
trunk/freenet/src/freenet/node/TestnetHandler.java
trunk/freenet/src/freenet/node/Version.java
trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
Log:
391: FCP: add short error descriptions as well as long ones
Modified: trunk/freenet/src/freenet/client/FetchException.java
===================================================================
--- trunk/freenet/src/freenet/client/FetchException.java 2006-01-26
20:21:46 UTC (rev 7938)
+++ trunk/freenet/src/freenet/client/FetchException.java 2006-01-26
21:09:43 UTC (rev 7939)
@@ -82,6 +82,65 @@
Logger.minor(this, "FetchException("+getMessage(mode)+"):
"+msg,this);
}
+ public static String getShortMessage(int mode) {
+ switch(mode) {
+ case TOO_DEEP_ARCHIVE_RECURSION:
+ return "Too deep archive recursion";
+ case UNKNOWN_SPLITFILE_METADATA:
+ return "Unknown splitfile metadata";
+ case TOO_MANY_REDIRECTS:
+ return "Too many redirects";
+ case UNKNOWN_METADATA:
+ return "Unknown metadata";
+ case INVALID_METADATA:
+ return "Invalid metadata";
+ case ARCHIVE_FAILURE:
+ return "Archive failure";
+ case BLOCK_DECODE_ERROR:
+ return "Block decode error";
+ case TOO_MANY_METADATA_LEVELS:
+ return "Too many metadata levels";
+ case TOO_MANY_ARCHIVE_RESTARTS:
+ return "Too many archive restarts";
+ case TOO_MUCH_RECURSION:
+ return "Too much recursion";
+ case NOT_IN_ARCHIVE:
+ return "Not in archive";
+ case HAS_MORE_METASTRINGS:
+ return "Not a manifest";
+ case BUCKET_ERROR:
+ return "Temporary files error";
+ case DATA_NOT_FOUND:
+ return "Data not found";
+ case ROUTE_NOT_FOUND:
+ return "Route not found";
+ case REJECTED_OVERLOAD:
+ return "Timeout or overload";
+ case INTERNAL_ERROR:
+ return "Internal error";
+ case TRANSFER_FAILED:
+ return "Transfer failed";
+ case SPLITFILE_ERROR:
+ return "Splitfile error";
+ case INVALID_URI:
+ return "Invalid URI";
+ case TOO_BIG:
+ return "Too big";
+ case TOO_BIG_METADATA:
+ return "Metadata too big";
+ case TOO_MANY_BLOCKS_PER_SEGMENT:
+ return "Too many blocks per segment";
+ case NOT_ENOUGH_METASTRINGS:
+ return "Not enough meta-strings"; // FIXME better
description
+ case CANCELLED:
+ return "Cancelled";
+ case ARCHIVE_RESTART:
+ return "Archive restarted";
+ default:
+ return "Unknown code "+mode;
+ }
+ }
+
public static String getMessage(int mode) {
switch(mode) {
case TOO_DEEP_ARCHIVE_RECURSION:
@@ -97,7 +156,7 @@
case ARCHIVE_FAILURE:
return "Failure in extracting files from an archive";
case BLOCK_DECODE_ERROR:
- return "Failed to decode a splitfile block";
+ return "Failed to decode a block";
case TOO_MANY_METADATA_LEVELS:
return "Too many levels of split metadata";
case TOO_MANY_ARCHIVE_RESTARTS:
@@ -131,11 +190,12 @@
case TOO_MANY_BLOCKS_PER_SEGMENT:
return "Too many blocks per segment";
case NOT_ENOUGH_METASTRINGS:
- return "No default document; give more metastrings in
URI";
+ return "No default document; give more metastrings
(path components) in URI";
+ // FIXME better description for above
case CANCELLED:
return "Cancelled by caller";
case ARCHIVE_RESTART:
- return "Archive restart";
+ return "Archive restarted";
default:
return "Unknown fetch error code: "+mode;
}
Modified: trunk/freenet/src/freenet/client/InserterException.java
===================================================================
--- trunk/freenet/src/freenet/client/InserterException.java 2006-01-26
20:21:46 UTC (rev 7938)
+++ trunk/freenet/src/freenet/client/InserterException.java 2006-01-26
21:09:43 UTC (rev 7939)
@@ -112,6 +112,33 @@
}
}
+ public static String getShortMessage(int mode) {
+ switch(mode) {
+ case INVALID_URI:
+ return "Invalid URI";
+ case BUCKET_ERROR:
+ return "Temp files error";
+ case INTERNAL_ERROR:
+ return "Internal error";
+ case REJECTED_OVERLOAD:
+ return "Timeout or overload";
+ case FATAL_ERRORS_IN_BLOCKS:
+ return "Some blocks failed fatally";
+ case TOO_MANY_RETRIES_IN_BLOCKS:
+ return "Some blocks ran out of retries";
+ case ROUTE_NOT_FOUND:
+ return "Route not found";
+ case ROUTE_REALLY_NOT_FOUND:
+ return "Request could not leave the node";
+ case COLLISION:
+ return "Collided with existing data";
+ case CANCELLED:
+ return "Cancelled";
+ default:
+ return "Unknown error "+mode;
+ }
+ }
+
/** Is this error fatal? Non-fatal errors are errors which are likely
to go away with
* more retries, or at least for which there is some point retrying.
*/
Modified: trunk/freenet/src/freenet/node/TestnetHandler.java
===================================================================
--- trunk/freenet/src/freenet/node/TestnetHandler.java 2006-01-26 20:21:46 UTC
(rev 7938)
+++ trunk/freenet/src/freenet/node/TestnetHandler.java 2006-01-26 21:09:43 UTC
(rev 7939)
@@ -71,7 +71,7 @@
while(true) {
try {
Socket s = server.accept();
- TestnetSocketHandler tsh = new
TestnetSocketHandler(s);
+ new TestnetSocketHandler(s);
} catch (IOException e) {
Logger.error(this, "Testnet failed to accept
socket: "+e, e);
}
@@ -100,6 +100,7 @@
InputStreamReader isr = new
InputStreamReader(is, "ISO-8859-1");
BufferedReader br = new BufferedReader(isr);
String command = br.readLine();
+ if(command == null) return;
Logger.minor(this, "Command: "+command);
if(command.equalsIgnoreCase("LIST")) {
Logger.minor(this, "Listing available
logs");
Modified: trunk/freenet/src/freenet/node/Version.java
===================================================================
--- trunk/freenet/src/freenet/node/Version.java 2006-01-26 20:21:46 UTC (rev
7938)
+++ trunk/freenet/src/freenet/node/Version.java 2006-01-26 21:09:43 UTC (rev
7939)
@@ -20,7 +20,7 @@
public static final String protocolVersion = "1.0";
/** The build number of the current revision */
- public static final int buildNumber = 390;
+ public static final int buildNumber = 391;
/** Oldest build of Fred we will talk to */
public static final int lastGoodBuild = 390;
Modified: trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java 2006-01-26
20:21:46 UTC (rev 7938)
+++ trunk/freenet/src/freenet/node/fcp/GetFailedMessage.java 2006-01-26
21:09:43 UTC (rev 7939)
@@ -9,6 +9,7 @@
final int code;
final String codeDescription;
+ final String shortCodeDescription;
final String extraDescription;
final FailureCodeTracker tracker;
final boolean isFatal;
@@ -19,6 +20,7 @@
this.code = e.mode;
this.codeDescription = FetchException.getMessage(code);
this.extraDescription = e.extraMessage;
+ this.shortCodeDescription =
FetchException.getShortMessage(code);
this.isFatal = e.isFatal();
this.identifier = identifier;
}
@@ -33,6 +35,7 @@
if(tracker != null) {
tracker.copyToFieldSet(sfs, "Errors.");
}
+ sfs.put("ShortCodeDescription", shortCodeDescription);
sfs.put("Identifier", identifier);
return sfs;
}
Modified: trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java 2006-01-26
20:21:46 UTC (rev 7938)
+++ trunk/freenet/src/freenet/node/fcp/PutFailedMessage.java 2006-01-26
21:09:43 UTC (rev 7939)
@@ -11,6 +11,7 @@
final int code;
final String codeDescription;
final String extraDescription;
+ final String codeShortDescription;
final FailureCodeTracker tracker;
final FreenetURI expectedURI;
final String identifier;
@@ -19,6 +20,7 @@
public PutFailedMessage(InserterException e, String identifier) {
this.code = e.getMode();
this.codeDescription = InserterException.getMessage(code);
+ this.codeShortDescription =
InserterException.getShortMessage(code);
this.extraDescription = e.extra;
this.tracker = e.errorCodes;
this.expectedURI = e.uri;
@@ -37,6 +39,7 @@
tracker.copyToFieldSet(fs, "Errors.");
}
fs.put("Fatal", Boolean.toString(isFatal));
+ fs.put("ShortCodeDescription", codeShortDescription);
if(expectedURI != null)
fs.put("ExpectedURI", expectedURI.toString());
return fs;
