Update of /cvsroot/freenet/freenet/src/freenet/node/states/data
In directory sc8-pr-cvs1:/tmp/cvs-serv24137/src/freenet/node/states/data
Modified Files:
SendData.java
Log Message:
6343:
Logging.
Catch and log throwables caught starting up interfaces, rather than killing ALL
interfaces when one throws.
Add new diagnostics sentDataFailed*
Send our own datasource when we receive an insert, like with requests.
Index: SendData.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/states/data/SendData.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -w -r1.35 -r1.36
--- SendData.java 12 Nov 2003 20:10:35 -0000 1.35
+++ SendData.java 20 Nov 2003 23:05:41 -0000 1.36
@@ -299,12 +299,13 @@
*/
protected State handleThrowable(Throwable t, boolean inWrite) {
if (logDEBUG) {
- if (t == null)
+ if (t == null) {
Core.logger.log(
this,
"SendData.handleThrowable(null," + inWrite +
") on " + this,
Logger.DEBUG);
- else
+
Core.diagnostics.occurrenceCounting("sentDataFailedCancelled", 1);
+ } else
Core.logger.log(
this,
"SendData.handleThrowable("
@@ -362,6 +363,7 @@
}
}
} else {
+
Core.diagnostics.occurrenceContinuous("sentDataFailedWierdException", 1);
Core.logger.log(
this,
"Unexpected exception "
@@ -377,6 +379,37 @@
// sorta
}
+ switch(result) {
+ case Presentation.CB_OK:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_OK",1);
+ break;
+ case Presentation.CB_ABORTED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_ABORTED",1);
+ break;
+ case Presentation.CB_RESTARTED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_RESTARTED",1);
+ break;
+ case Presentation.CB_BAD_DATA:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_BAD_DATA",1);
+ break;
+ case Presentation.CB_SEND_CONN_DIED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_SEND_CONN_DIED",1);
+ break;
+ case Presentation.CB_RECV_CONN_DIED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_RECV_CONN_DIED",1);
+ break;
+ case Presentation.CB_BAD_KEY:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_BAD_KEY", 1);
+ break;
+ case Presentation.CB_CACHE_FAILED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_CACHE_FAILED",1);
+ break;
+ case Presentation.CB_CANCELLED:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_CANCELLED",1);
+ break;
+ default:
+
Core.diagnostics.occurrenceCounting("sentDataFailedCB_UNKNOWN", 1);
+ }
Core.diagnostics.occurrenceBinomial("sentData", 1, 0);
try {
in.close();
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
