From 4a59c19ac931646288afcae88e21b4cab739a917 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sat, 25 Nov 2017 19:53:25 +0000
Subject: [PATCH] Console: Show full logger.config path on /configlogging Don't
 say 'Plugin downloaded' when installing from file

---
 .../java/src/net/i2p/router/update/PluginUpdateRunner.java   | 3 ++-
 .../java/src/net/i2p/router/web/ConfigLoggingHelper.java     | 5 ++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
index bd5525df2..d7fc8d09f 100644
--- a/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
+++ b/apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
@@ -136,7 +136,8 @@ class PluginUpdateRunner extends UpdateRunner {
 
         @Override
         public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile, boolean notModified) {
-            updateStatus("<b>" + _t("Plugin downloaded") + "</b>");
+            if (!(_xpi2pURL.startsWith("file:") || _method == UpdateMethod.FILE))
+                updateStatus("<b>" + _t("Plugin downloaded") + "</b>");
             File f = new File(_updateFile);
             File appDir = new SecureDirectory(_context.getConfigDir(), PLUGIN_DIR);
             if ((!appDir.exists()) && (!appDir.mkdir())) {
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
index 730e684e8..30bf9553a 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
@@ -1,5 +1,6 @@
 package net.i2p.router.web;
 
+import java.io.File;
 import java.util.List;
 import java.util.Properties;
 import java.util.Set;
@@ -42,7 +43,9 @@ public class ConfigLoggingHelper extends HelperBase {
         buf.append("<p>")
            .append(_t("Add additional logging statements above (e.g. {0}).", "<b>net.i2p.router.tunnel=WARN</b>"))
            .append("<br>")
-           .append(_t("Alternatively, put entries in the file {0} (e.g. {1}).", "<b>logger.config</b>", "<b>logger.record.net.i2p.router.tunnel=WARN</b>"))
+           .append(_t("Alternatively, put entries in the file {0} (e.g. {1}).",
+                      "<b>" + new File(_context.getConfigDir(), "logger.config") + "</b>",
+                      "<b>logger.record.net.i2p.router.tunnel=WARN</b>"))
            .append("<br>")
            .append(_t("Valid log levels are {0}.", "<b>DEBUG, INFO, WARN, ERROR, CRIT</b>"))
            .append("</p>\n");