Move meassurement to abstract_user

mautrix_telegram/__main__.py

@@ -73,6 +73,8 @@ class TelegramBridge(Bridge):
 
     periodic_sync_task: asyncio.Task = None
 
+    latest_telegram_update_timestamp: float
+
     def prepare_db(self) -> None:
         super().prepare_db()
         init_db(self.db)
@@ -165,13 +167,14 @@ def is_bridge_ghost(self, user_id: UserID) -> bool:
     async def count_logged_in_users(self) -> int:
         return len([user for user in User.by_tgid.values() if user.tgid])
 
-    def update_bridge_readiness(self):
-        for portal in Portal.all():
-            if portal.latest_event_timestamp and portal.latest_event_timestamp < time() - PORTAL_INACTIVE_THRESHOLD:
-                self.az.live = False
-                return
+    def update_bridge_liveness(self):
+        self.latest_telegram_update_timestamp = time()
         self.az.live = True
 
+    def check_bridge_liveness(self):
+        if self.latest_telegram_update_timestamp and self.latest_telegram_update_timestamp < time() - PORTAL_INACTIVE_THRESHOLD:
+            self.az.live = False
+
     async def _update_active_puppet_metric(self) -> None:
         active_users = UserActivity.get_active_count(
             self.config['bridge.limits.min_puppet_activity_days'],
@@ -208,6 +211,9 @@ async def manhole_global_namespace(self, user_id: UserID) -> Dict[str, Any]:
             "Puppet": Puppet,
         }
 
+    def update_bridge_readiness(self):
+        time()
+
     @property
     def manhole_banner_program_version(self) -> str:
         return f"{super().manhole_banner_program_version} and Telethon {__telethon_version__}"

mautrix_telegram/abstract_user.py

@@ -201,6 +201,7 @@ async def _update_catch(self, update: TypeUpdate) -> None:
             self.log.exception("Failed to handle Telegram update")
             UPDATE_ERRORS.labels(update_type=update_type).inc()
         UPDATE_TIME.labels(update_type=update_type).observe(time.time() - start_time)
+        self.brige.update_bridge_readiness()
 
     @property
     @abstractmethod

mautrix_telegram/portal/telegram.py

@@ -15,7 +15,6 @@
 # along with this program.  If not, see <https://www.gnu.org/licenses/>.
 from typing import Awaitable, Dict, List, Optional, Tuple, Union, NamedTuple, TYPE_CHECKING
 from abc import ABC
-from time import time
 import random
 import mimetypes
 import codecs
@@ -66,8 +65,6 @@
 
 
 class PortalTelegram(BasePortal, ABC):
-    latest_event_timestamp: float = time()
-
     async def handle_telegram_typing(self, user: p.Puppet, update: UpdateTyping) -> None:
         if user.is_real_user:
             # Ignore typing notifications from double puppeted users to avoid echoing
@@ -616,8 +613,6 @@ async def _backfill_messages(self, source: 'AbstractUser', min_id: Optional[int]
 
     async def handle_telegram_message(self, source: 'AbstractUser', sender: p.Puppet,
                                       evt: Message) -> None:
-        self.latest_event_timestamp = time()
-
         if self.bridge.is_blocked:
             self.log.debug(f"Bridge is blocked, dropping telegram message {evt.id}")
             return