Record the node in LogFileHeader
Change-Id: Idf5897a8e5972808db0bb85c99ef45bd5c6d62df
diff --git a/aos/events/logging/logger.cc b/aos/events/logging/logger.cc
index 57d6909..2780bd5 100644
--- a/aos/events/logging/logger.cc
+++ b/aos/events/logging/logger.cc
@@ -415,9 +415,11 @@
fbb.CreateString("00000000-0000-4000-8000-000000000000");
flatbuffers::Offset<Node> node_offset;
+ flatbuffers::Offset<Node> logger_node_offset;
if (configuration::MultiNode(configuration_)) {
node_offset = CopyFlatBuffer(node, &fbb);
+ logger_node_offset = CopyFlatBuffer(event_loop_->node(), &fbb);
}
aos::logger::LogFileHeader::Builder log_file_header_builder(fbb);
@@ -427,6 +429,7 @@
// Only add the node if we are running in a multinode configuration.
if (node != nullptr) {
log_file_header_builder.add_node(node_offset);
+ log_file_header_builder.add_logger_node(logger_node_offset);
}
log_file_header_builder.add_configuration(configuration_offset);
diff --git a/aos/events/logging/logger.fbs b/aos/events/logging/logger.fbs
index 34c62c6..fecfd6e 100644
--- a/aos/events/logging/logger.fbs
+++ b/aos/events/logging/logger.fbs
@@ -52,15 +52,15 @@
// All log parts generated by a single Logger instance will have the same
// value here.
- logger_instance_uuid: string (id: 9);
+ logger_instance_uuid: string (id: 10);
// All log parts generated on a single node while it is booted will have the
// same value here. It also matches with the one used by systemd.
- boot_uuid: string (id: 10);
+ boot_uuid: string (id: 11);
// All log events across all nodes produced by a single high-level start event
// will have the same value here.
- log_start_uuid: string (id: 11);
+ log_start_uuid: string (id: 12);
// Part files which go together all have headers. When creating a log file
// with multiple parts, the logger should stop writing to part n-1 as soon
@@ -77,6 +77,9 @@
// And the parts_index corresponds to which part this is in the sequence. The
// index should start at 0.
parts_index:int32 (id: 8);
+
+ // The node the data was logged on, if known and running in a multi-node configuration.
+ logger_node:Node (id: 9);
}
// Table holding a message.