commit a0c41ba70d0d3f549d54372c49cdd6569f8be9f8
author Austin Schuh <austin.linux@gmail.com> Thu Sep 10 22:59:14 2020 -0700
committer Brian Silverman <bsilver16384@gmail.com> Wed Sep 16 21:10:24 2020 -0700
tree 2a4a346a81bb9f67ca0daec6f8cc93cb87cb0725
parent c6d6ee8d6980e4f518e424b9e36d1f065f90e626

Actually manage memory in the old-style AOS logging

LeakSanitizer should be happy with it now. It's also still just as
thread-safe.

Change-Id: Id09a0349657cf4f719267b053f0ea3d8ec366256

aos/events/shm_event_loop.cc

diff --git a/aos/events/shm_event_loop.cc b/aos/events/shm_event_loop.cc
index 29f01a4..406325d 100644
--- a/aos/events/shm_event_loop.cc
+++ b/aos/events/shm_event_loop.cc
@@ -964,9 +964,11 @@
   ReserveEvents();
 
   {
+    logging::ScopedLogRestorer prev_logger;
     AosLogToFbs aos_logger;
     if (!skip_logger_) {
       aos_logger.Initialize(MakeSender<logging::LogMessageFbs>("/aos"));
+      prev_logger.Swap(aos_logger.implementation());
     }
 
     aos::SetCurrentThreadName(name_.substr(0, 16));