commit a630f0812acae5d54c59dfc6bddf1264115f3689
author George Liu <liuxiwei@ieisystem.com> Wed Aug 28 14:42:55 2024 +0800
committer George Liu <liuxiwei@ieisystem.com> Wed Aug 28 14:42:55 2024 +0800
tree e73ed73efdb52a69b89cdadcfef6198b1c864f26
parent 150d5f6af7be3fbc3ac38f5dfab174830f08ee5b

Remove DEBUG flag

Since lg2 already supports the debug log level and the log level can
be modified in journald-maxlevel-policy.conf [1], there is no need to
add the DEBUG flag in this repo.

[1]: https://github.com/openbmc/openbmc/blob/master/meta-phosphor/recipes-core/systemd/phosphor-systemd-policy/journald-maxlevel-policy.conf

Signed-off-by: George Liu <liuxiwei@ieisystem.com>
Change-Id: I8a4a0564707478b8f8fdbbd128a2e2f7908c2ce6

virtualSensor.cpp

diff --git a/virtualSensor.cpp b/virtualSensor.cpp
index 13786d8..de8ddc0 100644
--- a/virtualSensor.cpp
+++ b/virtualSensor.cpp
@@ -4,7 +4,6 @@
 
 #include <fstream>
 
-static constexpr bool DEBUG = false;
 static constexpr auto sensorDbusPath = "/xyz/openbmc_project/sensors/";
 static constexpr auto vsThresholdsIfaceSuffix = ".Thresholds";
 static constexpr std::array<const char*, 2> calculationIfaces = {
@@ -365,8 +364,7 @@
     }
 
     /* Print all parameters for debug purpose only */
-    if (DEBUG)
-        printParams(paramMap);
+    printParams(paramMap);
 }
 
 void VirtualSensor::createAssociation(const std::string& objPath,
@@ -414,10 +412,7 @@
 
     createAssociation(objPath, entityPath);
     /* Print all parameters for debug purpose only */
-    if (DEBUG)
-    {
-        printParams(paramMap);
-    }
+    printParams(paramMap);
 }
 
 void VirtualSensor::setSensorValue(double value)
@@ -479,11 +474,7 @@
 
     /* Set sensor value to dbus interface */
     setSensorValue(val);
-
-    if (DEBUG)
-    {
-        debug("Sensor {NAME} = {VALUE}", "NAME", this->name, "VALUE", val);
-    }
+    debug("Sensor {NAME} = {VALUE}", "NAME", this->name, "VALUE", val);
 
     /* Check sensor thresholds and log required message */
     checkThresholds(val, perfLossIface);
@@ -577,29 +568,20 @@
         {
             criticalIface->setEntityInterfaceHigh(
                 threshold.value("CriticalHighDirection", ""));
-            if (DEBUG)
-            {
-                debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
-                      "INTF", threshold.value("CriticalHighDirection", ""));
-            }
+            debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
+                  "INTF", threshold.value("CriticalHighDirection", ""));
         }
         if (threshold.contains("CriticalLow"))
         {
             criticalIface->setEntityInterfaceLow(
                 threshold.value("CriticalLowDirection", ""));
-            if (DEBUG)
-            {
-                debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
-                      "INTF", threshold.value("CriticalLowDirection", ""));
-            }
+            debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
+                  "INTF", threshold.value("CriticalLowDirection", ""));
         }
 
         criticalIface->setEntityPath(entityPath);
-        if (DEBUG)
-        {
-            debug("Sensor Threshold:{NAME} = path:{PATH}", "NAME", objPath,
-                  "PATH", entityPath);
-        }
+        debug("Sensor Threshold:{NAME} = path:{PATH}", "NAME", objPath, "PATH",
+              entityPath);
 
         criticalIface->criticalHigh(threshold.value(
             "CriticalHigh", std::numeric_limits<double>::quiet_NaN()));
@@ -620,29 +602,20 @@
         {
             warningIface->setEntityInterfaceHigh(
                 threshold.value("WarningHighDirection", ""));
-            if (DEBUG)
-            {
-                debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
-                      "INTF", threshold.value("WarningHighDirection", ""));
-            }
+            debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
+                  "INTF", threshold.value("WarningHighDirection", ""));
         }
         if (threshold.contains("WarningLow"))
         {
             warningIface->setEntityInterfaceLow(
                 threshold.value("WarningLowDirection", ""));
-            if (DEBUG)
-            {
-                debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
-                      "INTF", threshold.value("WarningLowDirection", ""));
-            }
+            debug("Sensor Threshold:{NAME} = intf:{INTF}", "NAME", objPath,
+                  "INTF", threshold.value("WarningLowDirection", ""));
         }
 
         warningIface->setEntityPath(entityPath);
-        if (DEBUG)
-        {
-            debug("Sensor Threshold:{NAME} = path:{PATH}", "NAME", objPath,
-                  "PATH", entityPath);
-        }
+        debug("Sensor Threshold:{NAME} = path:{PATH}", "NAME", objPath, "PATH",
+              entityPath);
 
         warningIface->warningHigh(threshold.value(
             "WarningHigh", std::numeric_limits<double>::quiet_NaN()));
@@ -947,10 +920,7 @@
     auto data = parseConfigFile();
 
     // print values
-    if (DEBUG)
-    {
-        debug("JSON: {JSON}", "JSON", data.dump());
-    }
+    debug("JSON: {JSON}", "JSON", data.dump());
 
     /* Get virtual sensors  config data */
     for (const auto& j : data)