[freenet-cvs] r15830 - trunk/freenet/src/freenet/clients/http

[nextg...@freenetproject.org]

Author: nextgens
Date: 2007-11-19 15:51:13 +0000 (Mon, 19 Nov 2007)
New Revision: 15830

Modified:
   trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
Log:
StartupToadlet: show the logfile even if it's short.

Yes it strips the first line out.

Modified: trunk/freenet/src/freenet/clients/http/StartupToadletServer.java
===================================================================
--- trunk/freenet/src/freenet/clients/http/StartupToadletServer.java    
2007-11-19 15:06:17 UTC (rev 15829)
+++ trunk/freenet/src/freenet/clients/http/StartupToadletServer.java    
2007-11-19 15:51:13 UTC (rev 15830)
@@ -92,10 +92,11 @@
                infoboxContent.addChild("#", "Your freenet node is starting up, 
please hold on.");

                 final File logs = new File("wrapper.log");
-                if(logs.exists() && logs.isFile() && logs.canRead() && 
logs.length() > 2000) {
+                long logSize = logs.length();
+                if(logs.exists() && logs.isFile() && logs.canRead() && logSize 
> 0) {
                     HTMLNode logInfobox = 
contentNode.addChild(ctx.getPageMaker().getInfobox("infobox-info", "Current 
status"));
                     HTMLNode logInfoboxContent = 
ctx.getPageMaker().getContentNode(logInfobox);
-                    String content = FileUtil.readUTF(logs, 
logs.length()-2000);
+                    String content = FileUtil.readUTF(logs, (logSize < 2000 ? 
0 : logSize - 2000));
                     int eol = content.indexOf('\n');
                     logInfoboxContent.addChild("%", content.substring((eol < 0 
? 0 : eol+1)).replaceAll("\n", "<br>\n"));
                 }