diff --git a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java index b7badb9e1d32212f16abfd5e0863f92d299cb4c9..959b8b797486d9a119fcf3a963ac5710cd213dc7 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -5,9 +5,16 @@ import java.util.List; import net.i2p.util.FileUtil; +import org.mortbay.http.Version; + public class LogsHelper extends HelperBase { public LogsHelper() {} + /** @since 0.8.11 */ + public String getJettyVersion() { + return Version.getImplVersion(); + } + public String getLogs() { String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); return _("File location") + ": <b><code>" + _context.logManager().currentFile() + "</code></b><br><br>" + str; diff --git a/apps/routerconsole/jsp/logs.jsp b/apps/routerconsole/jsp/logs.jsp index 4376dce9bb147ca43f4b8b2a070bc277fbc3d281..210b00f93f91115be48dbedc6053efdeded29b90 100644 --- a/apps/routerconsole/jsp/logs.jsp +++ b/apps/routerconsole/jsp/logs.jsp @@ -21,13 +21,14 @@ <b>I2P version:</b> <%=net.i2p.router.RouterVersion.FULL_VERSION%><br> <b>Java version:</b> <%=System.getProperty("java.vendor")%> <%=System.getProperty("java.version")%> (<%=System.getProperty("java.runtime.name")%> <%=System.getProperty("java.runtime.version")%>)<br> <b>Wrapper version:</b> <%=System.getProperty("wrapper.version", "none")%><br> + <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" /> + <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> +<b>Server version:</b> <jsp:getProperty name="logsHelper" property="jettyVersion" /><br> <b>Platform:</b> <%=System.getProperty("os.name")%> <%=System.getProperty("os.arch")%> <%=System.getProperty("os.version")%><br> <b>Processor:</b> <%=net.i2p.util.NativeBigInteger.cpuModel()%> (<%=net.i2p.util.NativeBigInteger.cpuType()%>)<br> <b>Jbigi:</b> <%=net.i2p.util.NativeBigInteger.loadStatus()%><br> <b>Encoding:</b> <%=System.getProperty("file.encoding")%></p> <p><%=intl._("Note that system information, log timestamps, and log messages may provide clues to your location; please review everything you include in a bug report.")%></p> - <jsp:useBean class="net.i2p.router.web.LogsHelper" id="logsHelper" scope="request" /> - <jsp:setProperty name="logsHelper" property="contextId" value="<%=(String)session.getAttribute("i2p.contextId")%>" /> <h3><%=intl._("Critical Logs")%></h3><a name="criticallogs"> </a> <jsp:getProperty name="logsHelper" property="criticalLogs" /> <h3><%=intl._("Router Logs")%> (<a href="configlogging"><%=intl._("configure")%></a>)</h3>