From c818f1df37f3ef33828fdf6e7d5948e5426ad06e Mon Sep 17 00:00:00 2001
From: Willem Melching <willem.melching@gmail.com>
Date: Fri, 20 Mar 2020 16:11:27 -0700
Subject: [PATCH] rename event name instead of service

---
 cereal                                | 2 +-
 selfdrive/debug/filter_log_message.py | 8 ++++----
 selfdrive/logcatd/logcatd.cc          | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/cereal b/cereal
index df82a53c16..b0c746b1e1 160000
--- a/cereal
+++ b/cereal
@@ -1 +1 @@
-Subproject commit df82a53c1669d4ca41d3090fa976c2c1860f1dab
+Subproject commit b0c746b1e1e3ca04f61484fd073123a1bf96afd1
diff --git a/selfdrive/debug/filter_log_message.py b/selfdrive/debug/filter_log_message.py
index 21eff887db..839cb7c8bc 100755
--- a/selfdrive/debug/filter_log_message.py
+++ b/selfdrive/debug/filter_log_message.py
@@ -32,7 +32,7 @@ if __name__ == "__main__":
   parser.add_argument("socket", type=str, nargs='*', help="socket name")
   args = parser.parse_args()
 
-  sm = messaging.SubMaster(['logMessage', 'androidLogEntry'], addr=args.addr)
+  sm = messaging.SubMaster(['logMessage', 'androidLog'], addr=args.addr)
 
   min_level = LEVELS[args.level]
 
@@ -48,8 +48,8 @@ if __name__ == "__main__":
       except json.decoder.JSONDecodeError:
         print(f"[{t / 1e9:.6f}] decode error: {sm['logMessage']}")
 
-    if sm.updated['androidLogEntry']:
-      t = sm.logMonoTime['androidLogEntry']
-      m = sm['androidLogEntry']
+    if sm.updated['androidLog']:
+      t = sm.logMonoTime['androidLog']
+      m = sm['androidLog']
       source = ANDROID_LOG_SOURCE[m.id]
       print(f"[{t / 1e9:.6f}] {source} {m.pid} {m.tag} - {m.message}")
diff --git a/selfdrive/logcatd/logcatd.cc b/selfdrive/logcatd/logcatd.cc
index c5a64f7100..81fafb71d0 100644
--- a/selfdrive/logcatd/logcatd.cc
+++ b/selfdrive/logcatd/logcatd.cc
@@ -29,7 +29,7 @@ int main() {
   assert(kernel_logger);
 
   Context * c = Context::create();
-  PubSocket * androidLog = PubSocket::create(c, "androidLogEntry");
+  PubSocket * androidLog = PubSocket::create(c, "androidLog");
   assert(androidLog != NULL);
 
   while (1) {