Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-01 06:38:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Added log ring buffer

Browse Source
This commit is contained in:
M66B
2021-12-01 17:03:29 +01:00
parent 7bc5e96f2e
commit b1c5951c14
3 changed files with 67 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/eu/faircode/email/EmailService.java
View File

@@ -45,8 +45,6 @@ import com.sun.mail.util.MailConnectException;
import com.sun.mail.util.SocketConnectException;
import com.sun.mail.util.TraceOutputStream;
import org.json.JSONException;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
@@ -80,7 +78,6 @@ import java.util.concurrent.ExecutorService;
import java.util.regex.Pattern;
import javax.mail.AuthenticationFailedException;
import javax.mail.Authenticator;
import javax.mail.Folder;
import javax.mail.MessagingException;
import javax.mail.NoSuchProviderException;
@@ -117,6 +114,7 @@ public class EmailService implements AutoCloseable {
private Service iservice;
private StoreListener listener;
private ServiceAuthenticator authenticator;
private RingBuffer<String> breadcrumbs;
private ExecutorService executor = Helper.getBackgroundExecutor(0, "mail");
@@ -136,6 +134,7 @@ public class EmailService implements AutoCloseable {
private final static int POOL_SIZE = 1; // connections
private final static int POOL_TIMEOUT = 60 * 1000; // milliseconds, default 45 sec
private final static long PROTOCOL_LOG_DURATION = 12 * 3600 * 1000L;
private final static int BREADCRUMBS_SIZE = 100;
private final static int MAX_IPV4 = 2;
private final static int MAX_IPV6 = 1;
@@ -679,6 +678,8 @@ public class EmailService implements AutoCloseable {
SSLSocketFactoryService factory) throws MessagingException {
isession = Session.getInstance(properties, authenticator);
breadcrumbs = new RingBuffer<>(BREADCRUMBS_SIZE);
isession.setDebug(debug || log);
if (debug || log)
isession.setDebugOut(new PrintStream(new OutputStream() {
@@ -693,6 +694,7 @@ public class EmailService implements AutoCloseable {
if (log)
EntityLog.log(context, EntityLog.Type.Protocol, user + " " + line);
else {
breadcrumbs.push(line);
if (BuildConfig.DEBUG)
Log.i("javamail", user + " " + line);
}
@@ -876,6 +878,11 @@ public class EmailService implements AutoCloseable {
}
}
public void dump() {
while (breadcrumbs != null && !breadcrumbs.isEmpty())
EntityLog.log(context, "Crumb " + breadcrumbs.pop());
}
private static class SocketFactoryService extends SocketFactory {
private SocketFactory factory = SocketFactory.getDefault();