commit 2878d96d21fc297ddb20768d6cfa13b14177192a
author Austin Schuh <austin.schuh@bluerivertech.com> Tue Jun 29 11:03:04 2021 -0700
committer Austin Schuh <austin.schuh@bluerivertech.com> Tue Jun 29 18:48:11 2021 -0700
tree 1ae89231f76d7157a8bf735f97fbdfd836516a95
parent 8bee6887adb1a9bd2a3ed93e281ef7d92065aa80

Make cout << LogFiles json parsable

Before, we were close to JSON parsable, but weren't fully compliant.
This was causing tools like jq to barf.  Fix that.

Change-Id: I398b36c0b34b3078879b3d54edfc26bbc8d1e63f
Signed-off-by: Austin Schuh <austin.schuh@bluerivertech.com>

aos/events/logging/logfile_sorting.cc

diff --git a/aos/events/logging/logfile_sorting.cc b/aos/events/logging/logfile_sorting.cc
index 65e8aba..17eda4e 100644
--- a/aos/events/logging/logfile_sorting.cc
+++ b/aos/events/logging/logfile_sorting.cc
@@ -892,13 +892,13 @@
   if (!file.logger_boot_uuid.empty()) {
     stream << " \"logger_boot_uuid\": \"" << file.logger_boot_uuid << "\",\n";
   }
-  stream << " \"config\": " << file.config.get();
+  stream << " \"config\": \"" << file.config.get() << "\"";
   if (!file.config_sha256.empty()) {
     stream << ",\n \"config_sha256\": \"" << file.config_sha256 << "\"";
   }
-  stream << ",\n \"monotonic_start_time\": " << file.monotonic_start_time
-         << ",\n \"realtime_start_time\": " << file.realtime_start_time
-         << ",\n";
+  stream << ",\n \"monotonic_start_time\": \"" << file.monotonic_start_time
+         << "\",\n \"realtime_start_time\": \"" << file.realtime_start_time
+         << "\",\n";
   stream << " \"parts\": [\n";
   for (size_t i = 0; i < file.parts.size(); ++i) {
     if (i != 0u) {
@@ -924,7 +924,7 @@
     stream << "  \"source_boot_uuid\": \"" << parts.source_boot_uuid << "\",\n";
     stream << "  \"boot_count\": " << parts.boot_count << ",\n";
   }
-  stream << "  \"config\": " << parts.config.get();
+  stream << "  \"config\": \"" << parts.config.get() << "\"";
   if (!parts.config_sha256.empty()) {
     stream << ",\n  \"config_sha256\": \"" << parts.config_sha256 << "\"";
   }
@@ -936,15 +936,15 @@
     stream << ",\n  \"logger_realtime_start_time\": \""
            << parts.logger_realtime_start_time << "\"";
   }
-  stream << ",\n  \"monotonic_start_time\": " << parts.monotonic_start_time
-         << ",\n  \"realtime_start_time\": " << parts.realtime_start_time
-         << ",\n  \"parts\": [";
+  stream << ",\n  \"monotonic_start_time\": \"" << parts.monotonic_start_time
+         << "\",\n  \"realtime_start_time\": \"" << parts.realtime_start_time
+         << "\",\n  \"parts\": [";
 
   for (size_t i = 0; i < parts.parts.size(); ++i) {
     if (i != 0u) {
       stream << ", ";
     }
-    stream << parts.parts[i];
+    stream << "\"" << parts.parts[i] << "\"";
   }
 
   stream << "]\n }";