mawei/dragonpilot
1
0
Fork 0
mirror of https://github.com/dragonpilot/dragonpilot.git synced 2026-06-27 17:02:04 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix androidLogEntry socket name

Browse Source
This commit is contained in:
Willem Melching
2020-03-20 15:59:48 -07:00
parent 16ad4bf58b
commit 196b28e311
3 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cereal
+1 -1
Submodule cereal updated: 6511990644...df82a53c16
selfdrive/debug/filter_log_message.py
+10 -11
View File
@@ -23,20 +23,19 @@ if __name__ == "__main__":
parser.add_argument("socket", type=str, nargs='*', help="socket name")
args = parser.parse_args()
if args.addr != "127.0.0.1":
os.environ["ZMQ"] = "1"
messaging.context = messaging.Context()
poller = messaging.Poller()
sock = messaging.sub_sock("logMessage", poller, addr=args.addr)
sm = messaging.SubMaster(['logMessage', 'androidLogEntry'], addr=args.addr)
min_level = LEVELS[args.level]
while True:
polld = poller.poll(1000)
for sock in polld:
evt = messaging.recv_one(sock)
log = json.loads(evt.logMessage)
sm.update()
if sm.updated['logMessage']:
t = sm.logMonoTime['logMessage']
log = json.loads(sm['logMessage'])
if log['levelnum'] >= min_level:
print(f"[{evt.logMonoTime / 1e9:.6f}] {log['filename']}:{log.get('lineno', '')} - {log.get('funcname', '')}: {log['msg']}")
print(f"[{t / 1e9:.6f}] {log['filename']}:{log.get('lineno', '')} - {log.get('funcname', '')}: {log['msg']}")
if sm.updated['androidLogEntry']:
t = sm.logMonoTime['androidLogEntry']
print(f"[{t / 1e9:.6f}] - ")
print(sm['androidLogEntry'])
selfdrive/logcatd/logcatd.cc
+1 -1
View File
@@ -29,7 +29,7 @@ int main() {
assert(kernel_logger);
Context * c = Context::create();
PubSocket * androidLog = PubSocket::create(c, "androidLog");
PubSocket * androidLog = PubSocket::create(c, "androidLogEntry");
assert(androidLog != NULL);
while (1) {