From 00441493206bd8bc1124151e0302f1e59030376e Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Thu, 6 Jan 2022 13:56:05 +0100 Subject: [PATCH 1/3] log ERROR messages in qlogs too --- cereal | 2 +- selfdrive/logmessaged.py | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/cereal b/cereal index 70aeecf0930376..b61c8319ddf731 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit 70aeecf0930376a9da236b6f274941488e593063 +Subproject commit b61c8319ddf7310d0d28061da56bdbe30b2c2ece diff --git a/selfdrive/logmessaged.py b/selfdrive/logmessaged.py index 9c40976562abd9..9196be54127bf5 100755 --- a/selfdrive/logmessaged.py +++ b/selfdrive/logmessaged.py @@ -17,7 +17,8 @@ def main() -> NoReturn: sock.bind("ipc:///tmp/logmessage") # and we publish them - pub_sock = messaging.pub_sock('logMessage') + log_message_sock = messaging.pub_sock('logMessage') + error_log_message_sock = messaging.pub_sock('errorLogMessage') while True: dat = b''.join(sock.recv_multipart()) @@ -29,7 +30,11 @@ def main() -> NoReturn: # then we publish them msg = messaging.new_message() msg.logMessage = record - pub_sock.send(msg.to_bytes()) + bts = msg.to_bytes() + + log_message_sock.send(bts) + if level >= 40: # logging.ERROR + error_log_message_sock.send(bts) if __name__ == "__main__": From 3fef229cc8ea546dfa9d17c3283718530023c83e Mon Sep 17 00:00:00 2001 From: Willem Melching Date: Thu, 6 Jan 2022 13:59:33 +0100 Subject: [PATCH 2/3] own event --- cereal | 2 +- selfdrive/logmessaged.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/cereal b/cereal index b61c8319ddf731..a1aaa8db39420d 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit b61c8319ddf7310d0d28061da56bdbe30b2c2ece +Subproject commit a1aaa8db39420d30e94538f95bf80005a4f98a15 diff --git a/selfdrive/logmessaged.py b/selfdrive/logmessaged.py index 9196be54127bf5..1d1fab51620092 100755 --- a/selfdrive/logmessaged.py +++ b/selfdrive/logmessaged.py @@ -30,11 +30,12 @@ def main() -> NoReturn: # then we publish them msg = messaging.new_message() msg.logMessage = record - bts = msg.to_bytes() + log_message_sock.send(msg.to_bytes()) - log_message_sock.send(bts) if level >= 40: # logging.ERROR - error_log_message_sock.send(bts) + msg = messaging.new_message() + msg.errorLogMessage = record + error_log_message_sock.send(msg.to_bytes()) if __name__ == "__main__": From 11cd203e760da51ef7eb6171991c58fa2dd755a5 Mon Sep 17 00:00:00 2001 From: Adeeb Shihadeh Date: Thu, 6 Jan 2022 15:22:00 -0800 Subject: [PATCH 3/3] bump cereal --- cereal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cereal b/cereal index a1aaa8db39420d..42542ee96ca007 160000 --- a/cereal +++ b/cereal @@ -1 +1 @@ -Subproject commit a1aaa8db39420d30e94538f95bf80005a4f98a15 +Subproject commit 42542ee96ca00744e6117d57533defe6f01ba14d