From b60e7559cf72fd42cc860101167f02335641ba90 Mon Sep 17 00:00:00 2001
From: Matt Spinler <spinler@us.ibm.com>
Date: Wed, 24 Jul 2019 15:28:08 -0500
Subject: Factor out log creation code common code.

In preparation for adding another function to create a log entry, factor
out some common code into a new function that will be able to be called
in both spots.

Signed-off-by: Matt Spinler <spinler@us.ibm.com>
Change-Id: I8881f4ec0d36a2b2e2b1897b63d524022a328286
---
 log_manager.cpp | 43 ++++++++++++++++++++++++-------------------
 log_manager.hpp | 10 ++++++++++
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/log_manager.cpp b/log_manager.cpp
index 0f4e57c..2920546 100644
--- a/log_manager.cpp
+++ b/log_manager.cpp
@@ -79,24 +79,6 @@ void Manager::commitWithLvl(uint64_t transactionId, std::string errMsg,
 void Manager::_commit(uint64_t transactionId, std::string&& errMsg,
                       Entry::Level errLvl)
 {
-    if (!Extensions::disableDefaultLogCaps())
-    {
-        if (errLvl < Entry::sevLowerLimit)
-        {
-            if (realErrors.size() >= ERROR_CAP)
-            {
-                erase(realErrors.front());
-            }
-        }
-        else
-        {
-            if (infoErrors.size() >= ERROR_INFO_CAP)
-            {
-                erase(infoErrors.front());
-            }
-        }
-    }
-
     constexpr const auto transactionIdVar = "TRANSACTION_ID";
     // Length of 'TRANSACTION_ID' string.
     constexpr const auto transactionIdVarSize = std::strlen(transactionIdVar);
@@ -199,7 +181,30 @@ void Manager::_commit(uint64_t transactionId, std::string&& errMsg,
 
     sd_journal_close(j);
 
-    // Create error Entry dbus object
+    createEntry(errMsg, errLvl, additionalData);
+}
+
+void Manager::createEntry(std::string errMsg, Entry::Level errLvl,
+                          std::vector<std::string> additionalData)
+{
+    if (!Extensions::disableDefaultLogCaps())
+    {
+        if (errLvl < Entry::sevLowerLimit)
+        {
+            if (realErrors.size() >= ERROR_CAP)
+            {
+                erase(realErrors.front());
+            }
+        }
+        else
+        {
+            if (infoErrors.size() >= ERROR_INFO_CAP)
+            {
+                erase(infoErrors.front());
+            }
+        }
+    }
+
     entryId++;
     if (errLvl >= Entry::sevLowerLimit)
     {
diff --git a/log_manager.hpp b/log_manager.hpp
index baf6812..15dd3af 100644
--- a/log_manager.hpp
+++ b/log_manager.hpp
@@ -167,6 +167,16 @@ class Manager : public details::ServerObject<details::ManagerIface>
      */
     void doExtensionLogCreate(const Entry& entry);
 
+    /** @brief Common wrapper for creating an Entry object
+     *
+     * @param[in] errMsg - The error exception message associated with the
+     *                     error log to be committed.
+     * @param[in] errLvl - level of the error
+     * @param[in] additionalData - The AdditionalData property for the error
+     */
+    void createEntry(std::string errMsg, Entry::Level errLvl,
+                     std::vector<std::string> additionalData);
+
     /** @brief Persistent sdbusplus DBus bus connection. */
     sdbusplus::bus::bus& busLog;
 
-- 
cgit v1.2.1