nutomic/syncthing-android
1
0
Fork 0
mirror of https://github.com/syncthing/syncthing-android.git synced 2024-12-23 11:21:29 +00:00
Code Releases Activity

Dont keep entire log file in memory for trimming (ref #862)

Browse source
This commit is contained in:
Felix Ableitner 2017-03-23 15:44:52 +09:00
parent d5c70f695c
commit b4e991838e
1 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/main/java/com/nutomic/syncthingandroid/service/SyncthingRunnable.java
View file

@ -14,17 +14,20 @@ import android.support.v4.app.NotificationCompat;
import android.text.TextUtils; import android.text.TextUtils;
import android.util.Log; import android.util.Log;
import com.annimon.stream.Stream;
import com.google.common.base.Charsets; import com.google.common.base.Charsets;
import com.google.common.io.Files; import com.google.common.io.Files;
import com.nutomic.syncthingandroid.R; import com.nutomic.syncthingandroid.R;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.DataOutputStream; import java.io.DataOutputStream;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.io.InputStreamReader; import java.io.InputStreamReader;
import java.io.LineNumberReader;
import java.util.Map; import java.util.Map;
import java.util.concurrent.atomic.AtomicReference; import java.util.concurrent.atomic.AtomicReference;
@ -43,7 +46,7 @@ public class SyncthingRunnable implements Runnable {
private static final String TAG_KILL = "SyncthingRunnableKill"; private static final String TAG_KILL = "SyncthingRunnableKill";
public static final String UNIT_TEST_PATH = "was running"; public static final String UNIT_TEST_PATH = "was running";
private static final String BINARY_NAME = "libsyncthing.so"; private static final String BINARY_NAME = "libsyncthing.so";
private static final int LOG_FILE_MAX_LINES = 10000; private static final int LOG_FILE_MAX_LINES = 10;
private static final int NOTIFICATION_ID_CRASH = 9; private static final int NOTIFICATION_ID_CRASH = 9;
private static final AtomicReference<Process> mSyncthing = new AtomicReference<>(); private static final AtomicReference<Process> mSyncthing = new AtomicReference<>();
@ -354,10 +357,27 @@ public class SyncthingRunnable implements Runnable {
*/ */
private void trimLogFile() { private void trimLogFile() {
try { try {
String lines = Stream.of(Files.readLines(mLogFile, Charsets.UTF_8)) LineNumberReader lnr = new LineNumberReader(new FileReader(mLogFile));
.limit(LOG_FILE_MAX_LINES) lnr.skip(Long.MAX_VALUE);
.reduce("", (a, b) -> a + b + "\n");
Files.write(lines, mLogFile, Charsets.UTF_8); int lineCount = lnr.getLineNumber();
lnr.close();
File tempFile = new File(mContext.getExternalFilesDir(null), "syncthing.log.tmp");
BufferedReader reader = new BufferedReader(new FileReader(mLogFile));
BufferedWriter writer = new BufferedWriter(new FileWriter(tempFile));
String currentLine;
int startFrom = lineCount - LOG_FILE_MAX_LINES;
for (int i = 0; (currentLine = reader.readLine()) != null; i++) {
if (i > startFrom) {
writer.write(currentLine + "\n");
}
}
writer.close();
reader.close();
tempFile.renameTo(mLogFile);
} catch (IOException e) { } catch (IOException e) {
Log.w(TAG, "Failed to trim log file", e); Log.w(TAG, "Failed to trim log file", e);
} }