power: remove GUI keepalive, daemon keepalive/watchdog, and accept-loop polling

Author: tarasglek

HelperDaemon.py

@@ -28,14 +28,12 @@
 import logging
 import atexit
 
-from WatchdogTimer import WatchdogTimer
 from ECController import ECController
 from EInkUSBController import EInkUSBController 
 
 # Configuration
 SOCKET_PATH = '/run/tinta4plus.sock'
 PID_FILE = '/tmp/tinta4plus.pid'
-WATCHDOG_TIMEOUT = 20.0  # seconds
 LOG_LEVEL = logging.DEBUG  # Changed to DEBUG for detailed EC port access logging
 SYSTEMD_FIRST_FD = 3
 
@@ -54,9 +52,6 @@ def __init__(self, logger):
         self.eink = None
         self.ec = None
 
-        # Watchdog
-        self.watchdog = WatchdogTimer(WATCHDOG_TIMEOUT, self.shutdown, self.logger)
-        
         # Setup signal handlers
         signal.signal(signal.SIGTERM, self._signal_handler)
         signal.signal(signal.SIGINT, self._signal_handler)
@@ -144,17 +139,9 @@ def handle_command(self, command_data):
 
             self.logger.debug(f"Handling command: {cmd}")
 
-            # Reset watchdog on any command
-            self.watchdog.reset()
-            
             response = {'success': False, 'error': None}
 
-            if cmd == 'keepalive':
-                # Simple keepalive/ping command
-                response['success'] = True
-                response['message'] = 'pong'
-            
-            elif cmd == 'enable-eink':
+            if cmd == 'enable-eink':
                 self.eink.enable_eink()
                 response['success'] = True
                 response['message'] = 'E-Ink display enabled'
@@ -355,22 +342,16 @@ def run(self):
             # Accept connections
             while self.running:
                 try:
-                    # Set timeout so we can check self.running periodically
-                    self.server_socket.settimeout(1.0)
-                    try:
-                        client_socket, _ = self.server_socket.accept()
-                        self.logger.info("Client connected")
-                        
-                        # Handle in a thread (though we expect only one client)
-                        client_thread = threading.Thread(
-                            target=self.handle_client,
-                            args=(client_socket,)
-                        )
-                        client_thread.daemon = True
-                        client_thread.start()
-                        
-                    except socket.timeout:
-                        continue
+                    client_socket, _ = self.server_socket.accept()
+                    self.logger.info("Client connected")
+                    
+                    # Handle in a thread (though we expect only one client)
+                    client_thread = threading.Thread(
+                        target=self.handle_client,
+                        args=(client_socket,)
+                    )
+                    client_thread.daemon = True
+                    client_thread.start()
 
                 except Exception as e:
                     if self.running:
@@ -423,18 +404,11 @@ def shutdown(self):
         else:
             self.logger.debug("Shutdown requested while not running; performing cleanup")
 
-        # Cancel watchdog
-        try:
-            self.watchdog.cancel()
-        except Exception as e:
-            self.logger.debug(f"Watchdog cancel during shutdown failed: {e}")
-
         # Cleanup resources even on early-startup failures
         try:
             self.cleanup_hardware()
         except Exception as e:
             self.logger.warning(f"Hardware cleanup failed: {e}")
-
         self._remove_socket()
         self._remove_pid_file()
 
@@ -474,11 +448,12 @@ def handle_exception(exc_type, exc_value, exc_traceback):
     sys.excepthook = handle_exception
 
     logger.info("ThinkBook E-Ink Helper starting")
-    logger.info(f"Watchdog timeout: {WATCHDOG_TIMEOUT}s")
 
     daemon = HelperDaemon(logger)
     return daemon.run()
 
 
 if __name__ == '__main__':
     sys.exit(main())
+
+

Tinta4Plus.py

@@ -171,7 +171,6 @@ class EInkControlGUI:
 
     # Configuration
     SOCKET_PATH = '/run/tinta4plus.sock'
-    KEEPALIVE_INTERVAL = 2.4  # seconds (send keepalive every 2.4s, watchdog is 20s)
     SOCKET_TIMEOUT = 10.0  # seconds
     CONFIG_DIR = os.path.expanduser("~/.config/Tinta4Plus")
     SETTINGS_FILE = os.path.join(os.path.expanduser("~/.config/Tinta4Plus"), "settings")
@@ -200,7 +199,6 @@ def __init__(self, root, HELPER_SCRIPT, logger):
 
         # Helper client
         self.helper = HelperClient(logger)
-        self.keepalive_after_id = None
 
         # Managers
         self.display_mgr = DisplayManager(logger)
@@ -660,7 +658,6 @@ def initialize_helper(self):
             if self.helper.connect(self.SOCKET_PATH, timeout=self.SOCKET_TIMEOUT):
                 self.update_status("Connected to helper daemon")
                 self.log_message("Connected to helper daemon")
-                self.start_keepalive()
                 self.root.after(500, self.check_ec_status)
                 return
         except Exception as e:
@@ -672,65 +669,9 @@ def initialize_helper(self):
             "Run installer or check:\n"
             "  systemctl status tinta4plus-helper.socket"
         )
-    
-    def start_keepalive(self):
-        """Start periodic keepalive messages"""
-        if self.keepalive_after_id:
-            self.root.after_cancel(self.keepalive_after_id)
-        
-        self.keepalive_after_id = self.root.after(
-            int(self.KEEPALIVE_INTERVAL * 1000),
-            self.send_keepalive
-        )
-        self.logger.info(f"Started keepalive timer ({self.KEEPALIVE_INTERVAL}s interval)")
-    
-    def send_keepalive(self):
-        """Send keepalive message to helper with improved error handling"""
-        if not self.helper.is_connected():
-            self.update_status("Helper disconnected - attempting restart...", error=True)
-            last_error = self.helper.get_last_error()
-            error_msg = f"Helper disconnected: {last_error}" if last_error else "Helper disconnected"
-            self.log_message(f"{error_msg}, attempting to restart...", level='error')
-            self.attempt_helper_restart()
-            return  # Don't schedule next keepalive
-        
-        try:
-            response = self.helper.send_command('keepalive')
-            if not response or not response.get('success'):
-                self.logger.warning(f"Keepalive failed: {response}")
-                self.log_message("Keepalive failed, restarting helper...", level='error')
-                self.attempt_helper_restart()
-                return
-            
-            # Log successful keepalive at debug level to avoid spam
-            self.logger.debug("Keepalive successful")
-            
-            # Schedule next keepalive
-            self.keepalive_after_id = self.root.after(
-                int(self.KEEPALIVE_INTERVAL * 1000),
-                self.send_keepalive
-            )
-            
-        except RuntimeError as e:
-            # Connection-related errors
-            self.logger.error(f"Keepalive connection error: {e}")
-            self.update_status("Helper connection lost - restarting...", error=True)
-            self.log_message(f"Connection error: {e}", level='error')
-            self.attempt_helper_restart()
-        
-        except Exception as e:
-            # Unexpected errors
-            self.logger.error(f"Keepalive unexpected error: {e}", exc_info=True)
-            self.update_status("Helper error - restarting...", error=True)
-            self.log_message(f"Unexpected error: {e}", level='error')
-            self.attempt_helper_restart()
-    
+
     def attempt_helper_restart(self):
         """Attempt to reconnect to systemd socket-activated helper."""
-        if self.keepalive_after_id:
-            self.root.after_cancel(self.keepalive_after_id)
-            self.keepalive_after_id = None
-
         self.log_message("Attempting to reconnect to helper daemon...")
 
         try:
@@ -745,7 +686,6 @@ def attempt_helper_restart(self):
             if self.helper.connect(self.SOCKET_PATH, timeout=self.SOCKET_TIMEOUT):
                 self.log_message("✓ Reconnected to helper daemon")
                 self.update_status("Reconnected to helper daemon")
-                self.start_keepalive()
                 self.root.after(500, self.check_ec_status)
                 return
         except Exception as e:
@@ -1093,10 +1033,6 @@ def on_closing(self):
         # Stop refresh timer
         self._stop_refresh_timer()
 
-        # Stop keepalive
-        if self.keepalive_after_id:
-            self.root.after_cancel(self.keepalive_after_id)
-
         # Disconnect from helper client socket
         if self.helper.is_connected():
             self.helper.disconnect()