spacecruft
/
nopenpilot
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rename event name instead of service

pull/1148/head
Willem Melching 2020-03-20 16:11:27 -07:00
parent f468ad3298
commit c818f1df37
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cereal

@ -1 +1 @@
Subproject commit df82a53c1669d4ca41d3090fa976c2c1860f1dab
Subproject commit b0c746b1e1e3ca04f61484fd073123a1bf96afd1

8
selfdrive/debug/filter_log_message.py
View File

@ -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}")

2
selfdrive/logcatd/logcatd.cc
View File

@ -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) {