commit 9b771e221e3854bbbf45a56bbcab97c62b0a05ec
author Brandon Kim <brandonkim@google.com> Mon Oct 05 12:02:01 2020 -0700
committer Brandon Kim <brandonkim@google.com> Mon Oct 05 13:56:38 2020 -0700
tree a8fbc7fea1037b1049beeb8a14f47c30d9090a6c
parent 92a15badce1a577e944bdbc8c7773865e9f61d41

Fix log entries

Logs with entries were not showing up due to the key value pairs having
spaces between =. Fix all entries in phosphor-nvme.

Signed-off-by: Brandon Kim <brandonkim@google.com>
Change-Id: Id73e11bc52d023d93952e3410b63f1d7638b3d44

nvme_manager.cpp

diff --git a/nvme_manager.cpp b/nvme_manager.cpp
index 6f9ca58..07ce839 100644
--- a/nvme_manager.cpp
+++ b/nvme_manager.cpp
@@ -185,7 +185,7 @@
         {
             // Drive is present but can not get data, turn on fault LED.
             log<level::ERR>("Drive status is good but can not get data.",
-                            entry("objPath = %s", config.index.c_str()));
+                            entry("OBJ_PATH=%s", config.index.c_str()));
             isError[config.index] = true;
         }
 
@@ -352,8 +352,7 @@
     }
     catch (const std::exception& e)
     {
-        log<level::ERR>("Error in polling loop. "),
-            entry("ERROR = %s", e.what());
+        log<level::ERR>("Error in polling loop. "), entry("ERROR=%s", e.what());
     }
 }
 
@@ -454,7 +453,7 @@
     }
     catch (const Json::exception& e)
     {
-        log<level::ERR>("Json Exception caught."), entry("MSG: %s", e.what());
+        log<level::ERR>("Json Exception caught."), entry("MSG=%s", e.what());
     }
 
     return nvmeConfigs;
@@ -481,7 +480,7 @@
             --retries;
             std::this_thread::sleep_for(delay);
             log<level::ERR>("Can not open gpio path.",
-                            entry("MSG: %s", e.what()));
+                            entry("MSG=%s", e.what()));
             continue;
         }
         break;
@@ -529,8 +528,7 @@
     // can not find. create dbus
     if (iter == nvmes.end())
     {
-        log<level::INFO>("SSD plug.",
-                         entry("index = %s", config.index.c_str()));
+        log<level::INFO>("SSD plug.", entry("INDEX=%s", config.index.c_str()));
 
         std::string objPath = NVME_OBJ_PATH + config.index;
         auto nvmeSSD =
@@ -618,10 +616,10 @@
                     {
                         log<level::ERR>(
                             "Present pin is true but power good pin is false.",
-                            entry("index = %s", config.index.c_str()));
+                            entry("INDEX=%s", config.index.c_str()));
                         log<level::ERR>(
                             "Erase SSD from map and d-bus.",
-                            entry("index = %s", config.index.c_str()));
+                            entry("INDEX=%s", config.index.c_str()));
 
                         isErrorPower[config.index] = true;
                     }

sdbusplus.hpp

diff --git a/sdbusplus.hpp b/sdbusplus.hpp
index 6844dfa..186a88d 100644
--- a/sdbusplus.hpp
+++ b/sdbusplus.hpp
@@ -40,9 +40,8 @@
         }
         catch (const std::exception& e)
         {
-            log<level::ERR>("Set properties fail.",
-                            entry("ERROR = %s", e.what()),
-                            entry("Object path = %s", objPath.c_str()));
+            log<level::ERR>("Set properties fail.", entry("ERROR=%s", e.what()),
+                            entry("OBJ_PATH=%s", objPath.c_str()));
             return;
         }
     }
@@ -68,9 +67,8 @@
         }
         catch (const std::exception& e)
         {
-            log<level::ERR>("Get properties fail.",
-                            entry("ERROR = %s", e.what()),
-                            entry("Object path = %s", objPath.c_str()));
+            log<level::ERR>("Get properties fail.", entry("ERROR=%s", e.what()),
+                            entry("OBJ_PATH=%s", objPath.c_str()));
             return false;
         }
 
@@ -92,8 +90,8 @@
         }
         catch (const std::exception& e)
         {
-            log<level::ERR>("Call method fail.", entry("ERROR = %s", e.what()),
-                            entry("Object path = %s", objPath.c_str()));
+            log<level::ERR>("Call method fail.", entry("ERROR=%s", e.what()),
+                            entry("OBJ_PATH=%s", objPath.c_str()));
             return;
         }
     }