msgq: simplify python logger wiring

msgq/__init__.py

@@ -1,6 +1,6 @@
 # must be built with scons
 from msgq.ipc_pyx import Context, Poller, SubSocket, PubSocket, SocketEventHandle, toggle_fake_events, \
-                                set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event, set_logger as _set_ipc_logger
+                                set_fake_prefix, get_fake_prefix, delete_fake_prefix, wait_for_one_event, set_logger
 from msgq.ipc_pyx import MultiplePublishersError, IpcError
 
 from typing import Optional, List, Union
@@ -12,31 +12,11 @@ assert set_fake_prefix
 assert get_fake_prefix
 assert delete_fake_prefix
 assert wait_for_one_event
+assert set_logger
 
 NO_TRAVERSAL_LIMIT = 2**64-1
 
 context = Context()
-_logger_callback = None
-
-
-def _set_visionipc_logger_if_available(callback):
-  try:
-    from msgq.visionipc.visionipc_pyx import set_logger as _set_visionipc_logger
-  except (ImportError, AttributeError):
-    return
-  _set_visionipc_logger(callback)
-
-
-def _get_logger_callback():
-  return _logger_callback
-
-
-def set_logger(callback):
-  global _logger_callback
-  _logger_callback = callback
-
-  _set_ipc_logger(callback)
-  _set_visionipc_logger_if_available(callback)
 
 
 def fake_event_handle(endpoint: str, identifier: Optional[Union[str, bytes]] = None, override: bool = True, enable: bool = False) -> SocketEventHandle:

msgq/visionipc/__init__.py

@@ -5,9 +5,3 @@ assert VisionIpcServer
 assert VisionStreamType
 assert get_endpoint_name
 assert set_logger
-
-try:
-  import msgq
-  set_logger(msgq._get_logger_callback())
-except (AttributeError, ImportError):
-  pass

msgq/visionipc/tests/test_visionipc.py

@@ -1,7 +1,6 @@
 import random
 from typing import Optional
 import numpy as np
-import msgq
 from msgq.visionipc import VisionIpcServer, VisionIpcClient, VisionStreamType
 
 
@@ -99,19 +98,3 @@ class TestVisionIpc:
     assert recv_buf is None
     del self.client
     del self.server
-
-  def test_python_logger_callback(self):
-    logs = []
-
-    def capture_log(level, file, line, message):
-      logs.append((level, file, line, message))
-
-    msgq.set_logger(capture_log)
-    try:
-      self.setup_vipc("camerad_logger_test", VisionStreamType.VISION_STREAM_ROAD)
-      del self.client
-      del self.server
-    finally:
-      msgq.set_logger(None)
-
-    assert any("Starting listener for: camerad_logger_test" in entry[3] for entry in logs)