Author: zothar
Date: 2006-05-18 04:49:13 +0000 (Thu, 18 May 2006)
New Revision: 8756
Modified:
trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
trunk/freenet/src/freenet/node/Node.java
trunk/freenet/src/freenet/node/PeerNode.java
trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
trunk/freenet/src/freenet/node/fcp/FCPServer.java
Log:
Tweak startup messages to consistently give relevant information. Add another
'which peer' answer in a logged message.
Modified: trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-05-18 03:57:03 UTC (rev 8755)
+++ trunk/freenet/src/freenet/clients/http/SimpleToadletServer.java
2006-05-18 04:49:13 UTC (rev 8756)
@@ -156,6 +156,7 @@
if(!enabled) {
Logger.normal(node, "Not starting Fproxy as it's
disabled");
+ System.out.println("Not starting Fproxy as it's
disabled");
this.networkInterface = null;
} else {
this.networkInterface = new NetworkInterface(port,
this.bindTo, this.allowedHosts);
@@ -163,8 +164,8 @@
myThread = new Thread(this, "SimpleToadletServer");
myThread.setDaemon(true);
myThread.start();
- System.out.println("Starting fproxy on port "+(port));
Logger.normal(this, "Starting fproxy on
"+bindTo+":"+port);
+ System.out.println("Starting fproxy on
"+bindTo+":"+port);
}
}
Modified: trunk/freenet/src/freenet/node/Node.java
===================================================================
--- trunk/freenet/src/freenet/node/Node.java 2006-05-18 03:57:03 UTC (rev
8755)
+++ trunk/freenet/src/freenet/node/Node.java 2006-05-18 04:49:13 UTC (rev
8756)
@@ -930,8 +930,8 @@
port = u.getPortNumber();
break;
} catch (Exception e) {
- Logger.normal(this, "Could not use port:
"+portNo+": "+e, e);
- System.err.println("Could not use port:
"+portNo+": "+e);
+ Logger.normal(this, "Could not use port:
"+bindto+":"+portNo+": "+e, e);
+ System.err.println("Could not use port:
"+bindto+":"+portNo+": "+e);
e.printStackTrace();
continue;
}
@@ -947,7 +947,8 @@
}
usm = u;
- System.out.println("Port number: "+port);
+ Logger.normal(this, "FNP port created on "+bindto+":"+port);
+ System.out.println("FNP port created on "+bindto+":"+port);
portNumber = port;
Logger.normal(Node.class, "Creating node...");
Modified: trunk/freenet/src/freenet/node/PeerNode.java
===================================================================
--- trunk/freenet/src/freenet/node/PeerNode.java 2006-05-18 03:57:03 UTC
(rev 8755)
+++ trunk/freenet/src/freenet/node/PeerNode.java 2006-05-18 04:49:13 UTC
(rev 8756)
@@ -1102,7 +1102,7 @@
changedAnything = true;
if(nominalPeer.isEmpty()) {
- Logger.normal(this, "No physical.udp");
+ Logger.normal(this, "No physical.udp in noderef for identity
'"+identityString+"', possibly at location '"+locationString+"'");
// detectedPeer stays as it is
} else {
/* yes, we pick up a random one : it will be updated on handshake
*/
Modified: trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
===================================================================
--- trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-05-18 03:57:03 UTC (rev 8755)
+++ trunk/freenet/src/freenet/node/TextModeClientInterfaceServer.java
2006-05-18 04:49:13 UTC (rev 8756)
@@ -74,6 +74,7 @@
}
else{
Logger.normal(node, "Not starting TMCI as it's
disabled");
+ System.out.println("Not starting TMCI as it's
disabled");
}
if(direct) {
Modified: trunk/freenet/src/freenet/node/fcp/FCPServer.java
===================================================================
--- trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-05-18 03:57:03 UTC
(rev 8755)
+++ trunk/freenet/src/freenet/node/fcp/FCPServer.java 2006-05-18 04:49:13 UTC
(rev 8756)
@@ -106,11 +106,13 @@
}
Logger.normal(this, "Starting FCP server on
"+bindTo+":"+port+".");
+ System.out.println("Starting FCP server on
"+bindTo+":"+port+".");
NetworkInterface networkInterface = null;
try {
networkInterface = new NetworkInterface(port,
bindTo, allowedHosts);
} catch (BindException be) {
- Logger.error(this, "Couldn't bind to FCP Port
"+port+". FCP Server not started.");
+ Logger.error(this, "Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
+ System.out.println("Couldn't bind to FCP Port
"+bindTo+":"+port+". FCP Server not started.");
}
this.networkInterface = networkInterface;
@@ -122,6 +124,7 @@
}
} else {
Logger.normal(this, "Not starting FCP server as it's
disabled");
+ System.out.println("Not starting FCP server as it's
disabled");
this.networkInterface = null;
this.node = null;
this.clientsByName = null;
