Author: zothar
Date: 2006-06-02 20:33:35 +0000 (Fri, 02 Jun 2006)
New Revision: 9004
Modified:
trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
trunk/freenet/src/freenet/node/Node.java
Log:
Fix the parts of r8991 that weren't committed as planned. Add URLs to 'NOT
using wrapper' message and fix both that message and the 'Using wrapper'
messages to check things at the right place.
Modified: trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-02 19:38:19 UTC (rev 9003)
+++ trunk/freenet/src/freenet/clients/http/DarknetConnectionsToadlet.java
2006-06-02 20:33:35 UTC (rev 9004)
@@ -204,7 +204,7 @@
row[5] =
VersionPrefixString+HTMLEncoder.encode(pn.getVersion())+VersionSuffixString;
row[6] = new
Double(pn.getLocation().getValue());
row[7] = backoff/1000 + "/" +
pn.getRoutingBackoffLength()/1000+lastBackoffReasonOutputString;
- row[8] = idleToString(now, idle);
+ row[8] = idleToString(now, idle,
pn.getPeerNodeStatus());
row[9] = HTMLEncoder.encode(pn.getName());
}
@@ -423,14 +423,6 @@
}
}
- private String idleToString(long now, long idle) {
- if (idle == -1) {
- return " ";
- } else {
- return (new Long((now - idle) / 60000)).toString();
- }
- }
-
private String idleToString(long now, long idle, int peerNodeStatus) {
if (idle == -1) {
return " ";
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-06-02 19:38:19 UTC (rev
9003)
+++ trunk/freenet/src/freenet/node/Node.java 2006-06-02 20:33:35 UTC (rev
9004)
@@ -857,8 +857,6 @@
Node(Config config, RandomSource random, LoggingConfigHandler lc,
NodeStarter ns) throws NodeInitException{
this(config, random, lc);
- Logger.normal(this, "Using wrapper correctly: "+ns);
- System.out.println("Using wrapper correctly: "+ns);
nodeStarter=ns;
}
@@ -885,8 +883,6 @@
Node(Config config, RandomSource random, LoggingConfigHandler lc) throws
NodeInitException {
// Easy stuff
nodeStarter=null;
- Logger.error(this, "NOT using wrapper (at least not correctly). Your
freenet-ext.jar and/or wrapper.conf need to be updated.");
- System.out.println("NOT using wrapper (at least not correctly). Your
freenet-ext.jar and/or wrapper.conf need to be updated.");
if(logConfigHandler != lc)
this.logConfigHandler=lc;
arkPutter = new MyARKInserter();
@@ -1394,6 +1390,13 @@
Logger.normal(this, "Freenet 0.7 Build #"+Version.buildNumber()+"
r"+Version.cvsRevision);
System.out.println("Freenet 0.7 Build #"+Version.buildNumber()+"
r"+Version.cvsRevision);
+ if(isUsingWrapper()) {
+ Logger.normal(this, "Using wrapper correctly: "+nodeStarter);
+ System.out.println("Using wrapper correctly: "+nodeStarter);
+ } else {
+ Logger.error(this, "NOT using wrapper (at least not correctly).
Your freenet-ext.jar
<http://downloads.freenetproject.org/alpha/freenet-ext.jar> and/or wrapper.conf
<https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/config/wrapper.conf>
need to be updated.");
+ System.out.println("NOT using wrapper (at least not correctly).
Your freenet-ext.jar
<http://downloads.freenetproject.org/alpha/freenet-ext.jar> and/or wrapper.conf
<https://emu.freenetproject.org/svn/trunk/apps/installer/installclasspath/config/wrapper.conf>
need to be updated.");
+ }
// Start services
// TMCI
