commit e715eae07e64f1fa3358f05546f44685fb0679cf
author Austin Schuh <austin.linux@gmail.com> Sat Oct 10 15:39:30 2020 -0700
committer Austin Schuh <austin.linux@gmail.com> Mon Oct 12 21:34:04 2020 -0700
tree 32f742b3123d37350d2b72c49a5881d18c885f86
parent d9f6d81cc9f61475e2de283c8fb66b9f073aac11

Put each log file in a folder

The filesystem was struggling.  If the path has a trailing /, then put
everything inside the folder.  Otherwise, use that as the base name and
append.

Change-Id: I042e4886989724c5e179fe81b3017a695cbfd016

aos/events/logging/log_namer.cc

diff --git a/aos/events/logging/log_namer.cc b/aos/events/logging/log_namer.cc
index 3067aea..474386e 100644
--- a/aos/events/logging/log_namer.cc
+++ b/aos/events/logging/log_namer.cc
@@ -244,7 +244,7 @@
 void MultiNodeLogNamer::OpenForwardedTimestampWriter(const Channel *channel,
                                                      DataWriter *data_writer) {
   std::string filename =
-      absl::StrCat("_timestamps", channel->name()->string_view(), "/",
+      absl::StrCat("timestamps", channel->name()->string_view(), "/",
                    channel->type()->string_view(), ".part",
                    data_writer->part_number, ".bfbs", extension_);
   CreateBufferWriter(filename, &data_writer->writer);
@@ -253,7 +253,7 @@
 void MultiNodeLogNamer::OpenWriter(const Channel *channel,
                                    DataWriter *data_writer) {
   const std::string filename = absl::StrCat(
-      "_", CHECK_NOTNULL(channel->source_node())->string_view(), "_data",
+      CHECK_NOTNULL(channel->source_node())->string_view(), "_data",
       channel->name()->string_view(), "/", channel->type()->string_view(),
       ".part", data_writer->part_number, ".bfbs", extension_);
   CreateBufferWriter(filename, &data_writer->writer);
@@ -262,9 +262,9 @@
 void MultiNodeLogNamer::OpenDataWriter() {
   std::string name;
   if (node() != nullptr) {
-    name = absl::StrCat(name, "_", node()->name()->string_view());
+    name = absl::StrCat(name, node()->name()->string_view(), "_");
   }
-  absl::StrAppend(&name, "_data.part", data_writer_.part_number, ".bfbs",
+  absl::StrAppend(&name, "data.part", data_writer_.part_number, ".bfbs",
                   extension_);
   CreateBufferWriter(name, &data_writer_.writer);
 }
@@ -277,7 +277,9 @@
     // means they're probably going to run out of space and get stuck too.
     return;
   }
-  const std::string filename = absl::StrCat(base_name_, path, temp_suffix_);
+  const std::string_view separator = base_name_.back() == '/' ? "" : "_";
+  const std::string filename =
+      absl::StrCat(base_name_, separator, path, temp_suffix_);
   if (!destination->get()) {
     if (ran_out_of_space_) {
       *destination = std::make_unique<DetachedBufferWriter>(

aos/events/logging/logger_main.cc

diff --git a/aos/events/logging/logger_main.cc b/aos/events/logging/logger_main.cc
index 1d0c55e..1bc74f2 100644
--- a/aos/events/logging/logger_main.cc
+++ b/aos/events/logging/logger_main.cc
@@ -28,8 +28,8 @@
         aos::logging::GetLogName("fbs_log"), event_loop.node());
   } else {
     log_namer = std::make_unique<aos::logger::MultiNodeLogNamer>(
-        aos::logging::GetLogName("fbs_log"), event_loop.configuration(),
-        event_loop.node());
+        absl::StrCat(aos::logging::GetLogName("fbs_log"), "/"),
+        event_loop.configuration(), event_loop.node());
   }
 
   aos::logger::Logger logger(&event_loop);