Merge pull request #170 from JdeRobot/neutral-ram

Add Neutral ram

Author: javizqh

manager/comms/new_consumer.py

@@ -2,10 +2,10 @@
 import logging
 from queue import Queue
 from uuid import uuid4
-from websocket_server import WebsocketServer
 from datetime import datetime
 
 from src.manager.comms.consumer_message import ManagerConsumerMessageException, ManagerConsumerMessage
+from src.manager.comms.websocker_server import WebsocketServer
 from src.manager.ram_logging.log_manager import LogManager
 
 
@@ -65,6 +65,8 @@ def handle_client_disconnect(self, client, server):
         self.server.allow_new_connections()
 
     def handle_message_received(self, client, server, websocket_message):
+        LogManager.logger.info(
+            f"message received length: {len(websocket_message)} from client {client}")
         LogManager.logger.info(
             f"message received: {websocket_message} from client {client}")
         message = None

manager/comms/thread.py

@@ -0,0 +1,41 @@
+# From https://github.com/Pithikos/python-websocket-server
+# Use this instead of python package because to solve OPCODE_CONTINUATION we have to apply a patch. See more in websocket_server.py
+
+import threading
+
+
+class ThreadWithLoggedException(threading.Thread):
+    """
+    Similar to Thread but will log exceptions to passed logger.
+
+    Args:
+        logger: Logger instance used to log any exception in child thread
+
+    Exception is also reachable via <thread>.exception from the main thread.
+    """
+
+    DIVIDER = "*"*80
+
+    def __init__(self, *args, **kwargs):
+        try:
+            self.logger = kwargs.pop("logger")
+        except KeyError:
+            raise Exception("Missing 'logger' in kwargs")
+        super().__init__(*args, **kwargs)
+        self.exception = None
+
+    def run(self):
+        try:
+            if self._target is not None:
+                self._target(*self._args, **self._kwargs)
+        except Exception as exception:
+            thread = threading.current_thread()
+            self.exception = exception
+            self.logger.exception(f"{self.DIVIDER}\nException in child thread {thread}: {exception}\n{self.DIVIDER}")
+        finally:
+            del self._target, self._args, self._kwargs
+
+
+class WebsocketServerThread(ThreadWithLoggedException):
+    """Dummy wrapper to make debug messages a bit more readable"""
+    pass