From c4f9485e13d247abeb49e10c731e4d159ea83fd7 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 20 May 2012 18:12:41 +0000
Subject: [PATCH] * Console: Add full file path to thread dump message
---
.../net/i2p/router/web/ConfigServiceHandler.java | 4 +++-
.../java/src/net/i2p/router/web/LogsHelper.java | 16 +++++++++++++---
2 files changed, 16 insertions(+), 4 deletions(-)
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 304d519f46..a9222158d6 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 818de376a7..aa6596a204 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>";
--
GitLab