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

Console: Add log clear buttons (ticket #2449)

Browse Source
This commit is contained in:
zzz
2020-05-04 16:59:46 +00:00
parent ea8e340895
commit f1307614c6
4 changed files with 88 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
apps/routerconsole/java/src/net/i2p/router/web/helpers/LogsHelper.java
View File

@ -13,10 +13,12 @@ import java.util.jar.Attributes;
import net.i2p.I2PAppContext;
import net.i2p.crypto.SigType;
import net.i2p.router.web.ConfigServiceHandler;
import net.i2p.router.web.CSSHelper;
import net.i2p.router.web.HelperBase;
import net.i2p.router.web.RouterConsoleRunner;
import net.i2p.util.FileUtil;
import net.i2p.util.Translate;
import net.i2p.util.UIMessages;
public class LogsHelper extends HelperBase {
@ -74,13 +76,55 @@ public class LogsHelper extends HelperBase {
}
/**
* Side effect - calls logManager.flush()
*
*/
public String getCriticalLogs() {
_context.logManager().flush();
return formatMessages(_context.logManager().getBuffer().getMostRecentCriticalMessages());
}
/**
* Call before getLogs()
*
* @return -1 if none
* @since 0.9.46
*/
public int getLastMessageNumber() {
UIMessages msgs = _context.logManager().getBuffer().getUIMessages();
if (msgs.isEmpty())
return -1;
return msgs.getLastMessageID();
}
/**
* Call before getLogs(), getCriticalLogs(), or getLastMessageNumber()
* Side effect - calls logManager.flush()
*
* @return -1 if none
* @since 0.9.46
*/
public int getLastCriticalMessageNumber() {
_context.logManager().flush();
UIMessages msgs = _context.logManager().getBuffer().getCriticalUIMessages();
if (msgs.isEmpty())
return -1;
return msgs.getLastMessageID();
}
/**
* @param n -1 for none
* @param crit -1 for none
* @param consoleNonce must match
* @since 0.9.46
*/
public void clearThrough(int n, int crit, String consoleNonce) {
if (!CSSHelper.getNonce().equals(consoleNonce))
return;
if (n >= 0)
_context.logManager().getBuffer().getUIMessages().clearThrough(n);
if (crit >= 0)
_context.logManager().getBuffer().getCriticalUIMessages().clearThrough(crit);
}
public String getServiceLogs() {
File f = ConfigServiceHandler.wrapperLogFile(_context);
String str;