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

Console: Handle wrapper log trunctaion

Browse Source 
More efficient line skipping
This commit is contained in:
zzz
2020-05-05 16:27:07 +00:00
parent 4996c05361
commit 6510e07b8b
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -169,11 +169,22 @@ public class LogsHelper extends HelperBase {
// platform encoding or UTF8 // platform encoding or UTF8
boolean utf8 = !_context.hasWrapper(); boolean utf8 = !_context.hasWrapper();
StringBuilder buf = new StringBuilder(MAX_WRAPPER_LINES * 80); StringBuilder buf = new StringBuilder(MAX_WRAPPER_LINES * 80);
toSkip = readTextFile(f, utf8, MAX_WRAPPER_LINES, toSkip, buf); long ntoSkip = readTextFile(f, utf8, MAX_WRAPPER_LINES, toSkip, buf);
if (toSkip >= 0) if (ntoSkip < toSkip) {
if (ntoSkip < 0) {
// error
str = null;
} else {
// truncated?
str = "";
}
// remove old setting
if (prop != null)
_context.router().saveConfig(PROP_LAST_WRAPPER, null);
} else {
str = buf.toString(); str = buf.toString();
else }
str = null; toSkip = ntoSkip;
} }
String loc = DataHelper.escapeHTML(f.getAbsolutePath()); String loc = DataHelper.escapeHTML(f.getAbsolutePath());
if (str == null) { if (str == null) {
@ -300,13 +311,22 @@ public class LogsHelper extends HelperBase {
in = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8")); in = new BufferedReader(new InputStreamReader(new FileInputStream(f), "UTF-8"));
else else
in = new BufferedReader(new InputStreamReader(new FileInputStream(f))); in = new BufferedReader(new InputStreamReader(new FileInputStream(f)));
Queue<String> lines = new ArrayBlockingQueue<String>(maxNumLines);
long i = 0; long i = 0;
while (i < skipLines) {
// skip without readLine() to avoid object churn
int c;
do {
c = in.read();
if (c < 0)
return i; // truncated
} while (c != '\n');
i++;
}
Queue<String> lines = new ArrayBlockingQueue<String>(maxNumLines);
synchronized(lines) { synchronized(lines) {
String line = null; String line = null;
while ( (line = in.readLine()) != null) { while ( (line = in.readLine()) != null) {
if (i++ < skipLines) i++;
continue;
if (lines.size() >= maxNumLines) if (lines.size() >= maxNumLines)
lines.poll(); lines.poll();
lines.offer(line); lines.offer(line);