Merge pull request #1066 from closeio/andrzej/p1/do-not-create-extra-thread-for-syncing

 Do not create an extra thread to run sync

Author: neob91-close

inbox/mailsync/backends/base.py

@@ -76,35 +76,32 @@ def _run(self):  # type: ignore[no-untyped-def]
             raise
 
     def _run_impl(self):  # type: ignore[no-untyped-def]
-        self.sync_thread = InterruptibleThread(
-            retry_with_logging,
-            self.sync,
-            account_id=self.account_id,
-            provider=self.provider_name,
-            logger=self.log,
-        )
-        self.sync_thread.start()
-        self.sync_thread.join()
-
-        if self.sync_thread.successful():
-            self._cleanup()
+        try:
+            retry_with_logging(
+                self.sync,
+                account_id=self.account_id,
+                provider=self.provider_name,
+                logger=self.log,
+            )
+        except Exception:
+            self.log.exception(
+                "mail sync raised an exception", provider=self.provider_name
+            )
+            raise
+        else:
             self.log.info(
                 "mail sync finished successfully", provider=self.provider_name
             )
-            return
-
-        self.log.error(
-            "mail sync raised an exception",
-            provider=self.provider_name,
-            exc=self.sync_thread.exception,
-        )
-        raise self.sync_thread.exception  # type: ignore[misc]
+        finally:
+            self._cleanup()
 
     def sync(self) -> Never:
         raise NotImplementedError
 
+    def stop(self) -> None:
+        raise NotImplementedError
+
     def _cleanup(self) -> None:
-        self.sync_thread.kill()
         with session_scope(self.namespace_id) as mailsync_db_session:
             for x in self.folder_monitors:  # type: ignore[attr-defined]
                 x.set_stopped(mailsync_db_session)

inbox/mailsync/backends/imap/monitor.py

@@ -217,5 +217,4 @@ def stop(self) -> None:
         kill_all(self.folder_monitors, block=False)
         if isinstance(self, GmailSyncMonitor):
             kill_all(self.label_rename_handlers.values(), block=False)
-        self.sync_thread.kill(block=False)
-        self.join()
+        self.kill()

inbox/mailsync/service.py

@@ -104,7 +104,7 @@ def __init__(  # type: ignore[no-untyped-def]
         )
 
         self.syncing_accounts = set()  # type: ignore[var-annotated]
-        self.email_sync_monitors = {}  # type: ignore[var-annotated]
+        self.email_sync_monitors: dict[int, BaseMailSyncMonitor] = {}
         self.contact_sync_monitors = {}  # type: ignore[var-annotated]
         self.event_sync_monitors = {}  # type: ignore[var-annotated]
         # Randomize the poll_interval so we maintain at least a little fairness