Replaced CustomHandler with HTTPSHandler in instrument server

Author: tieneupin

src/murfey/instrument_server/__init__.py

@@ -25,9 +25,10 @@ def start_instrument_server():
     from rich.logging import RichHandler
 
     import murfey
-    import murfey.client.websocket
-    from murfey.client.customlogging import CustomHandler
+    from murfey.client.customlogging import HTTPSHandler
     from murfey.util import LogFilter
+    from murfey.util.api import url_path_for
+    from murfey.util.client import read_config
 
     parser = argparse.ArgumentParser(description="Start the Murfey server")
     parser.add_argument(
@@ -55,22 +56,21 @@ def start_instrument_server():
     logging.getLogger("fastapi").addHandler(rich_handler)
     logging.getLogger("uvicorn").addHandler(rich_handler)
 
-    # Create a websocket app to connect to the backend
-    ws = murfey.client.websocket.WSApp(
-        server=read_config().get("Murfey", "server", fallback=""),
-        register_client=False,
-    )
+    # Construct URL for the HTTPS log handler
+    client_config = dict(read_config()["Murfey"])
+    murfey_server_url = client_config["server"].rstrip("/")
+    logger_url = f"{murfey_server_url}{url_path_for('api.hub.router', 'forward_logs')}"
 
     # Forward DEBUG levels logs and above from Murfey to the backend
-    murfey_ws_handler = CustomHandler(ws.send)
-    murfey_ws_handler.setLevel(logging.DEBUG)
-    logging.getLogger("murfey").addHandler(murfey_ws_handler)
+    murfey_https_handler = HTTPSHandler(endpoint_url=logger_url)
+    murfey_https_handler.setLevel(logging.DEBUG)
+    logging.getLogger("murfey").addHandler(murfey_https_handler)
 
     # Forward only INFO level logs and above for other packages
-    other_ws_handler = CustomHandler(ws.send)
-    other_ws_handler.setLevel(logging.INFO)
-    logging.getLogger("fastapi").addHandler(other_ws_handler)
-    logging.getLogger("uvicorn").addHandler(other_ws_handler)
+    other_https_handler = HTTPSHandler(endpoint_url=logger_url)
+    other_https_handler.setLevel(logging.INFO)
+    logging.getLogger("fastapi").addHandler(other_https_handler)
+    logging.getLogger("uvicorn").addHandler(other_https_handler)
 
     logger.info(
         f"Starting Murfey server version {murfey.__version__}, listening on {args.host}:{args.port}"

tests/instrument_server/test_init.py

@@ -142,10 +142,6 @@ def test_start_instrument_server(
     # Disable 'run'; we just want to confirm it's called correctly
     mock_server.run.return_value = lambda: None
 
-    # Patch the websocket instance
-    mock_wsapp = mocker.patch("murfey.client.websocket.WSApp")
-    mock_wsapp.return_value = mocker.Mock()  # Disable functionality
-
     # Construct the expected Uvicorn Config object and save it as a dict
     expected_config = vars(
         uvicorn.Config(