Update of /cvsroot/freenet/freenet/src/freenet/node
In directory sc8-pr-cvs1:/tmp/cvs-serv2307/src/freenet/node
Modified Files:
Main.java
Log Message:
6171:
Add ConnectionHandler.useValue(). Use it to queue messages to the least congested
connection if we can't get a non-sending() connection. Prevents a nasty feedback
situation. Also tweak the 2 connections logic - it's 2 *message* connections, not 2
connections full stop.
Process queued connections immediately on going below lowRunningConnections, don't
wait for the next incoming connection.
Update LocalHTTPInterface a bit (not actually used, just for testing new HTTP
infrastructure).
Logging, indenting.
Index: Main.java
===================================================================
RCS file: /cvsroot/freenet/freenet/src/freenet/node/Main.java,v
retrieving revision 1.255
retrieving revision 1.256
diff -u -r1.255 -r1.256
--- Main.java 2 Sep 2003 17:05:21 -0000 1.255
+++ Main.java 5 Sep 2003 03:32:43 -0000 1.256
@@ -1496,22 +1496,22 @@
iv.addElement(new LocalNIOInterface(la, tf, fcp, fcpHosts,
-1, -1));
+
// Test HTTP interface
- // try {
- // MultipleHttpServletContainer container = new
MultipleHttpServletContainer(node,
- //
false);
- // // FIXME: hardcoded
- // Params mainportParams =
(Params)(params.getSet("mainport"));
- // mainportParams = (Params)(mainportParams.getSet("params"));
-
- // container.init(mainportParams, "mainport.params");
- // LocalHTTPInterface testInterface =
- // new LocalHTTPInterface(ltcp.getListeningAddress(9999,
Node.dontLimitClients), rsl, wsl, container, "127.0.0.0/8", Node.maxThreads/5,
Node.maxThreads/3);
- // iv.addElement(testInterface);
- // } catch (ServiceException e) {
- // Core.logger.log(Main.class, "Could not initialize service:
"+e, e,
- // Logger.ERROR);
- // }
+// try {
+// MultipleHttpServletContainer container =
+// new MultipleHttpServletContainer(node, false);
+// // FIXME: hardcoded
+// Params mainportParams = (Params)(params.getSet("mainport"));
+// mainportParams = (Params)(mainportParams.getSet("params"));
+// container.init(mainportParams, "mainport.params");
+// LocalHTTPInterface testInterface =
+// new LocalHTTPInterface(ltcp.getListeningAddress(9999,
Node.dontLimitClients), container, "127.0.0.0/8", Node.maxThreads/5,
Node.maxThreads/3);
+// iv.addElement(testInterface);
+// } catch (ServiceException e) {
+// Core.logger.log(Main.class, "Could not initialize service:
"+e, e,
+// Logger.ERROR);
+// }
// plus services
String[] services = params.getList("services");
if (services != null && !services[0].equals("none")) {
_______________________________________________
cvs mailing list
[EMAIL PROTECTED]
http://dodo.freenetproject.org/cgi-bin/mailman/listinfo/cvs
