Update of /cvsroot/freenet/freenet/src/freenet/node/states/announcing
In directory sc8-pr-cvs1:/tmp/cvs-serv2657/src/freenet/node/states/announcing
Modified Files:
AnnouncementRequestToken.java CompleteAnnouncement.java
SendAnnouncement.java ExecuteAnnouncement.java
Log Message:
Yet more Logger warnings.
Index: AnnouncementRequestToken.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/AnnouncementRequestToken.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- AnnouncementRequestToken.java 30 Oct 2003 01:34:04 -0000 1.10
+++ AnnouncementRequestToken.java 31 Oct 2003 18:25:12 -0000 1.11
@@ -1,5 +1,6 @@
package freenet.node.states.announcing;
+import freenet.Core;
import freenet.FieldSet;
import freenet.MessageSendCallback;
import freenet.Storables;
@@ -35,20 +36,20 @@
int unreachable, int restarted, int rejected,
MessageSendCallback cb) {
++failed;
- n.logger.log(this, "Failed "+failed+" of "+attempts
+ Core.logger.log(this, "Failed "+failed+" of "+attempts
+" initial requests: "+reason, Logger.MINOR);
}
public void dataNotFound(Node n, long toq,
freenet.MessageSendCallback cb) {
++failed;
- n.logger.log(this, "Failed "+failed+" of "+attempts
+ Core.logger.log(this, "Failed "+failed+" of "+attempts
+" initial requests: data not found", Logger.MINOR);
}
public void storeData(Node n, NodeReference nr, long rate, int hopsSinceReset,
MessageSendCallback cb) {
++succeeded;
- n.logger.log(this, "Succeeded with "+succeeded+" of "+attempts
+ Core.logger.log(this, "Succeeded with "+succeeded+" of "+attempts
+" initial requests", Logger.MINOR);
}
}
Index: CompleteAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/CompleteAnnouncement.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -w -r1.9 -r1.10
--- CompleteAnnouncement.java 30 Oct 2003 01:34:03 -0000 1.9
+++ CompleteAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.10
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.util.Enumeration;
+import freenet.Core;
import freenet.Key;
import freenet.Message;
import freenet.MessageObject;
@@ -47,7 +48,7 @@
public State receivedMessage(Node n, NoComplete nc) throws BadStateException {
if (nc != this.nc)
throw new BadStateException("Not my NoComplete");
- n.logger.log(this,
+ Core.logger.log(this,
"Announcement attempt failed, no reply from: "+target,
Logger.MINOR);
signalFailed(n, false, nc.toString());
@@ -56,7 +57,7 @@
public State receivedMessage(Node n, AnnouncementFailed af) {
nc.cancel();
- n.logger.log(this, "Announcement attempt failed: "
+ Core.logger.log(this, "Announcement attempt failed: "
+af.reasonName(), new Exception("debug"),
Logger.NORMAL);
@@ -75,11 +76,11 @@
ac.readKeys(hopsToLive);
}
catch (ParseIOException e) {
- n.logger.log(this, "Error parsing key list, attempting to continue",
+ Core.logger.log(this, "Error parsing key list, attempting to continue",
e, Logger.MINOR);
}
catch (IOException e) {
- n.logger.log(this, "I/O error reading key list", e, Logger.MINOR);
+ Core.logger.log(this, "I/O error reading key list", e, Logger.MINOR);
return null;
}
Index: SendAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/SendAnnouncement.java,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -w -r1.17 -r1.18
--- SendAnnouncement.java 30 Oct 2003 01:34:04 -0000 1.17
+++ SendAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.18
@@ -1,6 +1,7 @@
package freenet.node.states.announcing;
import freenet.CommunicationException;
+import freenet.Core;
import freenet.MessageObject;
import freenet.Peer;
import freenet.message.NodeAnnouncement;
@@ -30,7 +31,7 @@
static State makeTry(Node n, long id, Peer target, int htl) {
if (htl > Node.maxHopsToLive) {
- n.logger.log(SendAnnouncement.class,
+ Core.logger.log(SendAnnouncement.class,
"Reducing announcement HTL from "+htl
+" to max of "+Node.maxHopsToLive, Logger.DEBUG);
htl = Node.maxHopsToLive;
@@ -120,7 +121,7 @@
return new ExecuteAnnouncement(this, nr);
} catch (CommunicationException e) {
n.diagnostics.occurrenceBinomial("outboundAggregateRequests", 1, 0);
- n.logger.log(this, "Sending NodeAnnouncement failed: "+e,
+ Core.logger.log(this, "Sending NodeAnnouncement failed: "+e,
Logger.MINOR);
//e, Logger.MINOR);
Index: ExecuteAnnouncement.java
===================================================================
RCS file:
/cvsroot/freenet/freenet/src/freenet/node/states/announcing/ExecuteAnnouncement.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -w -r1.10 -r1.11
--- ExecuteAnnouncement.java 30 Oct 2003 01:34:04 -0000 1.10
+++ ExecuteAnnouncement.java 31 Oct 2003 18:25:12 -0000 1.11
@@ -4,6 +4,7 @@
import java.io.OutputStream;
import freenet.CommunicationException;
+import freenet.Core;
import freenet.Key;
import freenet.Message;
import freenet.MessageObject;
@@ -54,15 +55,15 @@
public State receivedMessage(Node n, AnnouncementFailed af) {
nr.cancel();
- if (af.reason() == af.KNOWN_ANNOUNCEE) {
- n.logger.log(this,
+ if (af.reason() == AnnouncementFailed.KNOWN_ANNOUNCEE) {
+ Core.logger.log(this,
"Announcement failed: "+af.reasonName(),
Logger.NORMAL);
signalFailed(n, true, af.reasonName());
return null;
// don't reduce the HTL
}
- n.logger.log(this, "Announcement attempt failed: "
+ Core.logger.log(this, "Announcement attempt failed: "
+af.reasonName(), Logger.NORMAL);
signalFailed(n, false, af.reasonName());
@@ -71,7 +72,7 @@
public State receivedMessage(Node n, QueryRejected mo) {
nr.cancel();
- n.logger.log(this, "Announcement attempt failed: "+mo, Logger.MINOR);
+ Core.logger.log(this, "Announcement attempt failed: "+mo, Logger.MINOR);
signalFailed(n, false, mo.toString());
@@ -82,7 +83,7 @@
public State receivedMessage(Node n, NoReply nr) throws BadStateException {
if (nr != this.nr)
throw new BadStateException("Not my NoReply");
- n.logger.log(this,
+ Core.logger.log(this,
"Announcement attempt failed, no reply from: "+target,
Logger.MINOR);
@@ -136,7 +137,7 @@
out = new TrailerWriterOutputStream(n.sendMessage(ae, target,
3*getTime(hopsToLive)));
} catch (CommunicationException e) {
- n.logger.log(this, "Sending AnnouncementExecute failed",
+ Core.logger.log(this, "Sending AnnouncementExecute failed",
e, Logger.MINOR);
// Error sending
signalFailed(n, false, e.toString());
@@ -145,7 +146,7 @@
try {
kl.writeTo(out);
} catch (IOException e) {
- n.logger.log(this, "Appending my value to AnnouncementExecute failed",
+ Core.logger.log(this, "Appending my value to AnnouncementExecute failed",
e, Logger.MINOR);
signalFailed(n, false, e.toString());
return null;
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
