From 934992d27579981bcbfffc8676db3aa3308166d0 Mon Sep 17 00:00:00 2001
From: Dirk Alders <dirk@mount-mockery.de>
Date: Mon, 12 Sep 2022 13:11:28 +0100
Subject: [PATCH] Timout handling for lirc client implemented

---
 remote_control.py | 42 ++++++++++++++++++++++++++++++------------
 1 file changed, 30 insertions(+), 12 deletions(-)

diff --git a/remote_control.py b/remote_control.py
index 856f20f..b6a02d3 100644
--- a/remote_control.py
+++ b/remote_control.py
@@ -2,7 +2,7 @@ import config
 import json
 import lirc
 import logging
-import paho.mqtt.client as mqtt
+import paho.mqtt.client as paho
 import report
 import socket
 import time
@@ -16,10 +16,12 @@ logger = logging.getLogger(ROOT_LOGGER_NAME).getChild('main')
 
 class remote_control(object):
     def __init__(self):
-        self.__lirc_client__ = lirc.Client()
+        self.__lirc_client__ = None
+        self.__lirc_init__()
+        #
         self.__start_data__ = None
         #
-        self.__client__ = mqtt.Client(config.APP_NAME)                          # create client object
+        self.__client__ = paho.Client(config.APP_NAME)                          # create client object
         self.__client__.on_message = self.__receive__                           # attach function to callback
         self.__client__.username_pw_set(config.MQTT_USER, config.MQTT_PASS)     # login with credentials
         try:
@@ -33,6 +35,13 @@ class remote_control(object):
         except (socket.timeout, OSError) as e:
             logger.warning("Erro while setting up mqtt instance and listener")
 
+    def __lirc_init__(self):
+        if self.__lirc_client__ is not None:
+            logger.info("Closing crashed lirc client instance")
+            self.__lirc_client__.close()
+        logger.info("Initiating lirc connection")
+        self.__lirc_client__ = lirc.Client()
+
     def __receive__(self, client, userdata, message):
         try:
             payload = json.loads(message.payload)
@@ -41,6 +50,7 @@ class remote_control(object):
         #
         remote = message.topic.split("/")[-2]
         command = message.topic.split("/")[-1]
+        #
         if payload is None:
             if self.__start_data__ is not None:
                 self.__send_stop__(*self.__start_data__)
@@ -62,23 +72,31 @@ class remote_control(object):
     def __send_once__(self, remote, command):
         try:
             self.__lirc_client__.send_once(remote, command)
-        except TimeoutError:
-            logger.exception("Timeout-Error while sending IR-Command.")
-        logger.info("Sending once: %s to %s.", command, remote)
+        except (TimeoutError, socket.timeout) as e:
+            self.__lirc_timeout_error__()
+        else:
+            logger.info("Sending once: %s to %s.", command, remote)
 
     def __send_start__(self, remote, command):
         try:
             self.__lirc_client__.send_start(remote, command)
-        except TimeoutError:
-            logger.exception("Timeout-Error while sending IR-Command.")
-        logger.info("Sending start: %s to %s.", command, remote)
+        except (TimeoutError, socket.timeout) as e:
+            self.__lirc_timeout_error__()
+        else:
+            logger.info("Sending start: %s to %s.", command, remote)
 
     def __send_stop__(self, remote, command):
         try:
             self.__lirc_client__.send_stop(remote, command)
-        except TimeoutError:
-            logger.exception("Timeout-Error while sending IR-Command.")
-        logger.info("Sending stop: %s to %s.", command, remote)
+        except (TimeoutError, socket.timeout) as e:
+            self.__lirc_timeout_error__()
+        else:
+            logger.info("Sending stop: %s to %s.", command, remote)
+
+    def __lirc_timeout_error__(self):
+        logger.error("Timeout-Error while sending IR-Command.")
+        self.__lirc_init__()
+
 
 if __name__ == '__main__': 
     report.appLoggingConfigure(config.__BASEPATH__, config.LOGTARGET, ((config.APP_NAME, config.LOGLVL), ), fmt=config.formatter, host=config.LOGHOST, port=config.LOGPORT)