put logcat in bootlog (commaai#23217)

* put logcat in boot log * continue * use std::unique_ptr * Revert "use std::unique_ptr" This reverts commit c671f8c.
budney · Dec 14, 2021 · f042962 · f042962
1 parent 36db473
commit f042962
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/selfdrive/logcatd/logcatd_android.cc b/selfdrive/logcatd/logcatd_android.cc
@@ -14,8 +14,10 @@ int main() {
   ExitHandler do_exit;
   PubMaster pm({"androidLog"});
 
-  log_time last_log_time = {};
-  logger_list *logger_list = android_logger_list_alloc(ANDROID_LOG_RDONLY | ANDROID_LOG_NONBLOCK, 0, 0);
+  struct timespec cur_time;
+  clock_gettime(CLOCK_REALTIME, &cur_time);
+  log_time last_log_time(cur_time);
+  logger_list *logger_list = nullptr;
 
   while (!do_exit) {
     // setup android logging

diff --git a/selfdrive/loggerd/bootlog.cc b/selfdrive/loggerd/bootlog.cc
@@ -11,6 +11,8 @@ static kj::Array<capnp::word> build_boot_log() {
   if (Hardware::TICI()) {
     bootlog_commands.push_back("journalctl");
     bootlog_commands.push_back("sudo nvme smart-log --output-format=json /dev/nvme0");
+  } else if (Hardware::EON()) {
+    bootlog_commands.push_back("logcat -d");
   }
 
   MessageBuilder msg;