From 256c5356fb84a56cc5857a2bd8afb042c51aa0c0 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Sun, 28 Jun 2009 17:40:17 +0000 Subject: [PATCH] Add router log location to logs.jsp --- .../java/src/net/i2p/router/web/LogsHelper.java | 3 ++- core/java/src/net/i2p/util/LogManager.java | 4 ++++ core/java/src/net/i2p/util/LogWriter.java | 5 ++++- 3 files changed, 10 insertions(+), 2 deletions(-) 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 9aee053f5e..e7fb539ecd 100644 --- a/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java +++ b/apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java @@ -9,7 +9,8 @@ public class LogsHelper extends HelperBase { public LogsHelper() {} public String getLogs() { - return formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); + String str = formatMessages(_context.logManager().getBuffer().getMostRecentMessages()); + return "Location: " + _context.logManager().currentFile() + "<br />" + str; } public String getCriticalLogs() { diff --git a/core/java/src/net/i2p/util/LogManager.java b/core/java/src/net/i2p/util/LogManager.java index c07445d9b5..73178b0d62 100644 --- a/core/java/src/net/i2p/util/LogManager.java +++ b/core/java/src/net/i2p/util/LogManager.java @@ -202,6 +202,10 @@ public class LogManager { loadConfig(); } + public String currentFile() { + return _writer.currentFile(); + } + /** * Used by Log to add records to the queue * diff --git a/core/java/src/net/i2p/util/LogWriter.java b/core/java/src/net/i2p/util/LogWriter.java index c9f2cb7562..b6302c3c4a 100644 --- a/core/java/src/net/i2p/util/LogWriter.java +++ b/core/java/src/net/i2p/util/LogWriter.java @@ -93,7 +93,10 @@ class LogWriter implements Runnable { } } - + public String currentFile() { + return _currentFile != null ? _currentFile.getAbsolutePath() : "uninitialized"; + } + private void rereadConfig() { long now = Clock.getInstance().now(); if (now - _lastReadConfig > CONFIG_READ_ITERVAL) { -- GitLab