echelon/i2p.i2p
1
0
Fork 0
forked from I2P_Developers/i2p.i2p
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Console: Show full logger.config path on /configlogging

Browse Source 
Don't say 'Plugin downloaded' when installing from file
This commit is contained in:
zzz
2017-11-25 19:53:25 +00:00
parent 51a6f298e2
commit 4a59c19ac9
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/routerconsole/java/src/net/i2p/router/update/PluginUpdateRunner.java
View File

@ -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())) {

5
apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java
View File

@ -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");