Rearranged socket handler

Author: Joel Collins

src/labthings/server/default_views/sockets.py

@@ -1,6 +1,7 @@
-from ..sockets import SocketSubscriber, socket_handler_loop
+from ..sockets import SocketSubscriber
 from ..find import current_labthing
 
+import gevent
 import logging
 
 
@@ -10,7 +11,21 @@ def socket_handler(ws):
     current_labthing().subscribers.add(wssub)
     logging.info(f"Added subscriber {wssub}")
     # Start the socket connection handler loop
-    socket_handler_loop(ws)
+    while not ws.closed:
+        message = ws.receive()
+        if message is None:
+            break
+        response = process_socket_message(message)
+        if response:
+            ws.send(response)
+        gevent.sleep(0.1)
     # Remove the subscriber once the loop returns
     current_labthing().subscribers.remove(wssub)
     logging.info(f"Removed subscriber {wssub}")
+
+
+def process_socket_message(message: str):
+    if message:
+        return None
+    else:
+        return None

src/labthings/server/sockets/__init__.py

@@ -1 +1 @@
-from .gevent import Sockets, SocketSubscriber, socket_handler_loop
+from .gevent import Sockets, SocketSubscriber

src/labthings/server/sockets/gevent.py

@@ -181,21 +181,3 @@ def wsgi_app(self, environ, start_response):
                     return []
         except (NotFound, KeyError):
             return self.app_wsgi_app(environ, start_response)
-
-
-def socket_handler_loop(ws):
-    while not ws.closed:
-        message = ws.receive()
-        if message is None:
-            break
-        response = process_socket_message(message)
-        if response:
-            ws.send(response)
-        gevent.sleep(0.1)
-
-
-def process_socket_message(message: str):
-    if message:
-        return None
-    else:
-        return None