commit 4e13b0a103353b48fac1c592dda0582cc6df26f7
author John Edward Broadbent <jebr@google.com> Mon Nov 15 15:21:59 2021 -0800
committer John Edward Broadbent <jebr@google.com> Fri Nov 19 13:51:02 2021 -0800
tree 809c25d990dbdfe6073e45855991d23824368dce
parent 2098dabe5c79ce61722a047bb67d0de0db8b590a

Add phosphor-logging

This commit adds phosphor-logging (lg2) to eStorageD. It also adds
several logging statements.

Signed-off-by: John Edward Broadbent <jebr@google.com>
Change-Id: Ideb4f6033b94dd8b1384c79cd3a26ce89e7b2c4c

phosphor-logging.wrap

diff --git a/phosphor-logging.wrap b/phosphor-logging.wrap
new file mode 100644
index 0000000..a039fcf
--- /dev/null
+++ b/phosphor-logging.wrap
@@ -0,0 +1,3 @@
+[wrap-git]
+url = https://github.com/openbmc/phosphor-logging.git
+revision = HEAD

src/estoraged.cpp

diff --git a/src/estoraged.cpp b/src/estoraged.cpp
index ae29bdd..8e49562 100644
--- a/src/estoraged.cpp
+++ b/src/estoraged.cpp
@@ -1,6 +1,8 @@
 
 #include "estoraged.hpp"
 
+#include <phosphor-logging/lg2.hpp>
+
 #include <iostream>
 #include <vector>
 
@@ -10,26 +12,36 @@
 void eStoraged::format(std::vector<uint8_t>)
 {
     std::cerr << "Formatting encrypted eMMC" << std::endl;
+    std::string msg = "OpenBMC.0.1.DriveFormat";
+    lg2::info("Starting format", "REDFISH_MESSAGE_ID", msg);
 }
 
 void eStoraged::erase(std::vector<uint8_t>, EraseMethod)
 {
     std::cerr << "Erasing encrypted eMMC" << std::endl;
+    std::string msg = "OpenBMC.0.1.DriveErase";
+    lg2::info("Starting erase", "REDFISH_MESSAGE_ID", msg);
 }
 
 void eStoraged::lock(std::vector<uint8_t>)
 {
     std::cerr << "Locking encrypted eMMC" << std::endl;
+    std::string msg = "OpenBMC.0.1.DriveLock";
+    lg2::info("Starting lock", "REDFISH_MESSAGE_ID", msg);
 }
 
 void eStoraged::unlock(std::vector<uint8_t>)
 {
     std::cerr << "Unlocking encrypted eMMC" << std::endl;
+    std::string msg = "OpenBMC.0.1.DriveUnlock";
+    lg2::info("Starting unlock", "REDFISH_MESSAGE_ID", msg);
 }
 
 void eStoraged::changePassword(std::vector<uint8_t>, std::vector<uint8_t>)
 {
     std::cerr << "Changing password for encrypted eMMC" << std::endl;
+    std::string msg = "OpenBMC.0.1.DrivePasswordChanged";
+    lg2::info("Starting change password", "REDFISH_MESSAGE_ID", msg);
 }
 
 } // namespace estoraged

src/main.cpp

diff --git a/src/main.cpp b/src/main.cpp
index 9fa9c7d..318ecda 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3,6 +3,7 @@
 
 #include <unistd.h>
 
+#include <phosphor-logging/lg2.hpp>
 #include <sdbusplus/bus.hpp>
 
 #include <filesystem>
@@ -69,8 +70,9 @@
     /* Create an eStoraged object. */
     estoraged::eStoraged esObject{b, path.c_str(), physicalBlockDev,
                                   containerBlockDev};
-
-    std::cerr << "eStoraged has started" << std::endl;
+    std::string msg = "OpenBMC.1.0.ServiceStarted";
+    lg2::info("Storage management service is running", "REDFISH_MESSAGE_ID",
+              msg);
 
     while (true)
     {

src/meson.build

diff --git a/src/meson.build b/src/meson.build
index 046ae47..958fa0a 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,6 +1,10 @@
 
 libeStoraged_deps = [
   dependency('sdbusplus'),
+  dependency('phosphor-logging',
+    fallback: ['phosphor-logging',
+               'phosphor_logging_dep'],
+    ),
   eStoraged_dbus,
 ]