commit cd225da87857c153e81f3abca6dfcc61c08272ea
author Jason M. Bills <jason.m.bills@linux.intel.com> Wed May 08 15:31:57 2019 -0700
committer Ed Tanous <ed.tanous@intel.com> Fri May 10 16:24:05 2019 +0000
tree 0f83792c0bb751197970243ddb287b30b2763193
parent 9f16b2c1b6b6884482bca304fcaa573caf91d0d6

Improve Redfish log entry parsing

This change makes the log entry parsing more robust by checking
only for the first space to get the timestamp instead of
splitting on all spaces.

Tested:
Added log entries using sensor override and confirmed that all
of them can be correctly displayed in the EventLog LogService.

Change-Id: Ic0374f6bf8d5ec052dae84b36ab48d16041c614f
Signed-off-by: Jason M. Bills <jason.m.bills@linux.intel.com>

redfish-core/lib/log_services.hpp

diff --git a/redfish-core/lib/log_services.hpp b/redfish-core/lib/log_services.hpp
index c5eae83..aa4fba7 100644
--- a/redfish-core/lib/log_services.hpp
+++ b/redfish-core/lib/log_services.hpp
@@ -27,6 +27,7 @@
 #include <boost/container/flat_map.hpp>
 #include <error_messages.hpp>
 #include <filesystem>
+#include <string_view>
 #include <variant>
 
 namespace redfish
@@ -503,19 +504,33 @@
                                  nlohmann::json &logEntryJson)
 {
     // The redfish log format is "<Timestamp> <MessageId>,<MessageArgs>"
-    // Use split to separate the entry into its fields
-    std::vector<std::string> logEntryFields;
-    boost::split(logEntryFields, logEntry, boost::is_any_of(" ,"),
-                 boost::token_compress_on);
-    // We need at least a MessageId to be valid
-    if (logEntryFields.size() < 2)
+    // First get the Timestamp
+    size_t space = logEntry.find_first_of(" ");
+    if (space == std::string::npos)
     {
         return 1;
     }
-    std::string &timestamp = logEntryFields[0];
-    std::string &messageID = logEntryFields[1];
-    std::string &messageArgsStart = logEntryFields[2];
-    std::size_t messageArgsSize = logEntryFields.size() - 2;
+    std::string timestamp = logEntry.substr(0, space);
+    // Then get the log contents
+    size_t entryStart = logEntry.find_first_not_of(" ", space);
+    if (entryStart == std::string::npos)
+    {
+        return 1;
+    }
+    std::string_view entry(logEntry);
+    entry.remove_prefix(entryStart);
+    // Use split to separate the entry into its fields
+    std::vector<std::string> logEntryFields;
+    boost::split(logEntryFields, entry, boost::is_any_of(","),
+                 boost::token_compress_on);
+    // We need at least a MessageId to be valid
+    if (logEntryFields.size() < 1)
+    {
+        return 1;
+    }
+    std::string &messageID = logEntryFields[0];
+    std::string &messageArgsStart = logEntryFields[1];
+    std::size_t messageArgsSize = logEntryFields.size() - 1;
 
     // Get the Message from the MessageRegistry
     const message_registries::Message *message =
@@ -622,17 +637,18 @@
         std::vector<std::filesystem::path> redfishLogFiles;
         getRedfishLogFiles(redfishLogFiles);
         uint64_t entryCount = 0;
+        std::string logEntry;
 
         // Oldest logs are in the last file, so start there and loop backwards
-        for (size_t i = redfishLogFiles.size() - 1; i >= 0; i--)
+        for (auto it = redfishLogFiles.rbegin(); it < redfishLogFiles.rend();
+             it++)
         {
-            std::ifstream logStream(redfishLogFiles[i]);
+            std::ifstream logStream(*it);
             if (!logStream.is_open())
             {
                 continue;
             }
 
-            std::string logEntry;
             while (std::getline(logStream, logEntry))
             {
                 entryCount++;