bmc-acf: use lg2 and improve logging

This changes the bmc-acf code to use lg2 (move away from log) and
fix problems with unacceptable (lowercase) journald keywords, and
reduce the number of log entries writen.

Tested:
Attempted to reproduce each log entry, and validate it is written
correctly to the journal.

Signed-off-by: Joseph Reynolds <[email protected]>

Author: joseph-reynolds

bmc-acf/acf_manager.cpp

@@ -1,7 +1,7 @@
 #include <acf_manager.hpp>
 #include <phosphor-logging/elog-errors.hpp>
 #include <phosphor-logging/elog.hpp>
-#include <phosphor-logging/log.hpp>
+#include <phosphor-logging/lg2.hpp>
 #include <tacf.hpp>
 #include <xyz/openbmc_project/Certs/error.hpp>
 
@@ -88,14 +88,13 @@ acf_info ACFCertMgr::installACF(std::vector<uint8_t> accessControlFile)
     }
     // Verify and install ACF and get expiration date.
     Tacf tacf{[](std::string msg) {
-        log<phosphor::logging::level::INFO>(msg.c_str());
+	    lg2::info(msg.c_str());
     }};
     int rc = tacf.install(accessControlFile.data(), accessControlFile.size(),
                           sDate);
     if (rc)
     {
-        log<level::INFO>("ACF install failed");
-        log<level::ERR>("Error: ", entry("rc=%0x", rc));
+        lg2::error("Error: ACF install failed, rc=0x{RC}", "RC", hex, rc);
         elog<InvalidCertificate>(Reason("ACF validation failed"));
     }
 
@@ -109,20 +108,19 @@ std::tuple<std::vector<uint8_t>, bool, std::string> ACFCertMgr::getACFInfo(void)
 
     if (!readBinaryFile(ACF_FILE_PATH, accessControlFile))
     {
-        log<level::ERR>("ACF not installed or not readable");
+        lg2::error("ACF not installed or not readable");
     }
     else
     {
         // Verify ACF and get expiration date.
         Tacf tacf{[](std::string msg) {
-            log<phosphor::logging::level::INFO>(msg.c_str());
+            lg2::info(msg.c_str());
         }};
         int rc = tacf.verify(accessControlFile.data(), accessControlFile.size(),
                              sDate);
         if (rc)
         {
-            log<level::INFO>("ACF is not valid");
-            log<level::ERR>("Error: ", entry("rc=%0x", rc));
+            lg2::error("Error: ACF is not valid, rc=0x{RC}", "RC", hex, rc);
             accessControlFile.clear();
             sDate.clear();
         }