diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java index 304d519f464a74012b6bf49f0205f3aaa48b6b04..a9222158d6562682105455ee5c155ecf4c72ae32 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java @@ -1,5 +1,6 @@ package net.i2p.router.web; +import java.io.File; import java.io.IOException; import java.util.List; @@ -208,7 +209,8 @@ public class ConfigServiceHandler extends FormHandler { } catch (Throwable t) { addFormError("Warning: unable to contact the service manager - " + t.getMessage()); } - addFormNotice("Threads dumped to wrapper.log"); + File wlog = LogsHelper.wrapperLogFile(_context); + addFormNotice(_("Threads dumped to {0}", wlog.getAbsolutePath())); } else if (_("View console on startup").equals(_action)) { browseOnStartup(true); addFormNotice(_("Console is to be shown on startup")); 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 818de376a7ed6732e1ae1cfb42d30f7258a231ea..aa6596a2047a5a5d36ef4a772185295e32d40aec 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -3,6 +3,7 @@ package net.i2p.router.web; import java.io.File; import java.util.List; +import net.i2p.I2PAppContext; import net.i2p.util.FileUtil; import net.i2p.util.VersionComparator; @@ -32,9 +33,13 @@ public class LogsHelper extends HelperBase { return formatMessages(_context.logManager().getBuffer().getMostRecentCriticalMessages()); } - public String getServiceLogs() { + /** + * Does not necessarily exist. + * @since 0.9.1 + */ + static File wrapperLogFile(I2PAppContext ctx) { File f = null; - if (_context.hasWrapper()) { + if (ctx.hasWrapper()) { String wv = System.getProperty("wrapper.version"); if (wv != null && (new VersionComparator()).compare(wv, LOCATION_AVAILABLE) >= 0) { try { @@ -51,9 +56,14 @@ public class LogsHelper extends HelperBase { // look in new and old places f = new File(System.getProperty("java.io.tmpdir"), "wrapper.log"); if (!f.exists()) - f = new File(_context.getBaseDir(), "wrapper.log"); + f = new File(ctx.getBaseDir(), "wrapper.log"); } } + return f; + } + + public String getServiceLogs() { + File f = wrapperLogFile(_context); String str = FileUtil.readTextFile(f.getAbsolutePath(), 250, false); if (str == null) return _("File not found") + ": <b><code>" + f.getAbsolutePath() + "</code></b>";