fix(session): separate ping and check for idle/dead sessions

Signed-off-by: Cedric Hombourger <[email protected]>

Author: chombourger

mtda/main.py

@@ -1662,7 +1662,7 @@ def start(self):
 
         if self.is_server is True:
             from mtda.utils import RepeatTimer
-            handler = self.session_ping
+            handler = self.session_check
             self._session_timer = RepeatTimer(10, handler)
             self._session_timer.start()
 
@@ -1715,6 +1715,20 @@ def stop(self):
             self.socket.close()
             self.socket = None
 
+    def session_check(self):
+        self.mtda.debug(4, "main.session_check()")
+
+        self._session_manager.check()
+
+        now = time.monotonic()
+        if self._power_expiry is not None and now > self._power_expiry:
+            self._target_off()
+            self._power_expiry = None
+            self.mtda.debug(2, "device powered down after "
+                               f"{self._power_timeout} seconds of inactivity")
+
+        self.mtda.debug(4, "main.session_check: exit")
+
     def session_event(self, info):
         self.mtda.debug(4, f"main.session_event({info})")
 
@@ -1752,14 +1766,7 @@ def session_ping(self, session=None):
 
         result = None
         if self._session_manager is not None:
-            result = self._session_manager.check(session)
-
-        now = time.monotonic()
-        if self._power_expiry is not None and now > self._power_expiry:
-            self._target_off()
-            self._power_expiry = None
-            self.mtda.debug(2, "device powered down after "
-                               f"{self._power_timeout} seconds of inactivity")
+            result = self._session_manager.ping(session)
 
         self.mtda.debug(4, f"main.session_ping: {result}")
         return result

mtda/session.py

@@ -36,11 +36,9 @@ def check(self, session=None):
         result = None
 
         with self._lock:
-            # Register new session
-            if session is not None:
-                if session not in self._sessions:
-                    events.append(f"{CONSTS.SESSION.ACTIVE} {session}")
-                self._sessions[session] = now + self._session_timeout
+            if self._ping(session):
+                # Announce new session
+                events.append(f"{CONSTS.SESSION.ACTIVE} {session}")
 
             # Check for inactive sessions
             inactive = []
@@ -150,6 +148,25 @@ def monitor(self, monitor):
         self.mtda.debug(4, f"session.monitor: {result}")
         return result
 
+    def _ping(self, session=None):
+        self.mtda.debug(4, f"session._ping({session})")
+
+        now = time.monotonic()
+        result = False
+
+        # Register new session
+        if session is not None:
+            if session not in self._sessions:
+                result = True
+            self._sessions[session] = now + self._session_timeout
+
+        self.mtda.debug(4, f"session._ping: {result}")
+        return result
+
+    def ping(self, session=None):
+        with self._lock:
+            self._ping(session)
+
     def set_timeout(self, timeout, session=None):
         self.mtda.debug(4, f"session.set_timeout({timeout}, {session})")