Expand JSON messages before they go out

python/sbp/client/loggers/base_logger.py

@@ -24,8 +24,9 @@ class BaseLogger(object):
     File to log to.
 
   """
-  def __init__(self, filename):
+  def __init__(self, filename, dispatcher=dispatch):
     self.handle = open(filename, "w+")
+    self.dispatcher = dispatcher
     self.base_time = time.time()
 
   def __enter__(self):

python/sbp/client/loggers/json_logger.py

@@ -22,9 +22,13 @@ def __call__(self, msg):
     self.call(msg)
 
   def fmt_msg(self, msg):
+    try:
+      data = self.dispatcher(msg).to_json_dict()
+    except KeyError:
+      data = msg.to_json_dict()
     return {"delta": self.delta(),
             "timestamp": self.timestamp(),
-            "data": msg.to_json_dict()}
+            "data": data}
 
   def call(self, msg):
     self.handle.write(json.dumps(self.fmt_msg(msg)) + "\n")

python/tests/sbp/client/test_logger.py

@@ -109,7 +109,12 @@ def test_pickle_log_missing():
   new_table.pop(SBP_MSG_PRINT, None)
   d = lambda msg: dispatch(msg, table=new_table)
   with PickleLogIterator(FileDriver(log_datafile), dispatcher=d) as log:
-    with pytest.raises(InvalidSBPMessageType) as exc_info:
+    with warnings.catch_warnings(record=True) as w:
       for delta, timestamp, msg in log.next():
         pass
-  assert str(exc_info.value).find("No message found for msg_type id 16*")
+    warnings.simplefilter("always")
+    assert len(w) == 13
+    for x in w:
+      assert issubclass(x.category, RuntimeWarning)
+      assert str(x.message).find("No message found for msg_type id 16*")
+