From dc759e5b9bc4e7a5579a647040f64bbb46ee8b2e Mon Sep 17 00:00:00 2001 From: ebethon Date: Fri, 6 Sep 2019 11:14:31 -0700 Subject: [PATCH] JSONLogIterator - Fix the iteration if the JSON is already unwrapped --- python/sbp/client/loggers/json_logger.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/python/sbp/client/loggers/json_logger.py b/python/sbp/client/loggers/json_logger.py index 001e6409f8..99688d4573 100644 --- a/python/sbp/client/loggers/json_logger.py +++ b/python/sbp/client/loggers/json_logger.py @@ -132,7 +132,10 @@ def __next__(self): for line in self.handle: try: data = json.loads(line) - item = SBP.from_json_dict(data.pop('data', data)) + if "payload" in data.keys(): + item = SBP.from_json_dict(data) + else: + item = SBP.from_json_dict(data.pop('data', data)) msg = self.dispatch(item, line) yield (msg, data) except (ValueError, UnicodeDecodeError):