From 365832355bcc8a4db04d3839fd3990a5c7f49485 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sat, 31 Jul 2021 11:26:37 +0200
Subject: [PATCH] Improved logging

---
 .../java/eu/faircode/email/ServiceSynchronize.java    | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index baba5cd04b..393c2ffd54 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1254,9 +1254,10 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
 
                             if ("Still here".equals(message) &&
                                     !account.isTransient(ServiceSynchronize.this)) {
-                                long now = new Date().getTime();
-                                if (now - start < STILL_THERE_THRESHOLD)
-                                    optimizeAccount(account, message);
+                                long elapsed = new Date().getTime() - start;
+                                if (elapsed < STILL_THERE_THRESHOLD)
+                                    optimizeAccount(account, "'" + message + "'" +
+                                            " elapsed=" + elapsed + " ms");
                             }
                         } else
                             try {
@@ -2248,7 +2249,9 @@ public class ServiceSynchronize extends ServiceBase implements SharedPreferences
         DB db = DB.getInstance(this);
 
         int pollInterval = getPollInterval(this);
-        EntityLog.log(this, "Auto optimize account=" + account.name + " poll interval=" + pollInterval);
+        EntityLog.log(this, account.name + " auto optimize" +
+                " reason=" + reason +
+                " poll interval=" + pollInterval);
         if (pollInterval == 0) {
             try {
                 db.beginTransaction();