Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Limit the number of lines we try to hold in memory.

Browse Source
This commit is contained in:
akwizgran
2020-07-02 17:30:32 +01:00
parent fef19c1329
commit 2d88819e80
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
briar-core/src/main/java/org/briarproject/briar/logging/PersistentLogManagerImpl.java
View File

@@ -22,9 +22,9 @@ import java.io.FileOutputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.List; import java.util.Deque;
import java.util.LinkedList;
import java.util.Scanner; import java.util.Scanner;
import java.util.concurrent.Executor; import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledExecutorService;
@@ -53,6 +53,7 @@ class PersistentLogManagerImpl implements PersistentLogManager,
private static final String LOG_FILE = "briar.log"; private static final String LOG_FILE = "briar.log";
private static final String OLD_LOG_FILE = "briar.log.old"; private static final String OLD_LOG_FILE = "briar.log.old";
private static final int MAX_LINES_TO_RETURN = 10_000;
private final ScheduledExecutorService scheduler; private final ScheduledExecutorService scheduler;
private final Executor ioExecutor; private final Executor ioExecutor;
@@ -142,14 +143,19 @@ class PersistentLogManagerImpl implements PersistentLogManager,
File oldLogFile = new File(dir, OLD_LOG_FILE); File oldLogFile = new File(dir, OLD_LOG_FILE);
if (oldLogFile.exists()) { if (oldLogFile.exists()) {
LOG.info("Reading old log file"); LOG.info("Reading old log file");
List<String> lines = new ArrayList<>(); Deque<String> lines = new LinkedList<>();
int numLines = 0;
InputStream in = new FileInputStream(oldLogFile); InputStream in = new FileInputStream(oldLogFile);
//noinspection TryFinallyCanBeTryWithResources //noinspection TryFinallyCanBeTryWithResources
try { try {
InputStream reader = streamReaderFactory InputStream reader = streamReaderFactory
.createLogStreamReader(in, oldLogKey); .createLogStreamReader(in, oldLogKey);
Scanner s = new Scanner(reader); Scanner s = new Scanner(reader);
while (s.hasNextLine()) lines.add(s.nextLine()); while (s.hasNextLine()) {
lines.add(s.nextLine());
if (numLines == MAX_LINES_TO_RETURN) lines.poll();
else numLines++;
}
s.close(); s.close();
return lines; return lines;
} finally { } finally {