commit a0744d38e93863ce3fb4bef2d4c70f9e9f640840
author Gunnar Mills <gmills@us.ibm.com> Mon Nov 09 15:40:45 2020 -0600
committer Gunnar Mills <gmills@us.ibm.com> Mon Nov 09 22:58:44 2020 +0000
tree 678ac3858c5f7e7fe0fd12b4b7a115b67339b679
parent 98e386ec2e203b8dfb69cb4037924fd913c98ce0

Manager: LOG: Remove __LINE__

Already in the log macro.

Change-Id: Ia4d2c801d8ec7dcef5141db1ef6a6eda1df24183
Signed-off-by: Gunnar Mills <gmills@us.ibm.com>

redfish-core/lib/managers.hpp

diff --git a/redfish-core/lib/managers.hpp b/redfish-core/lib/managers.hpp
index c621de3..d8e2fe8 100644
--- a/redfish-core/lib/managers.hpp
+++ b/redfish-core/lib/managers.hpp
@@ -788,8 +788,7 @@
         }
         else
         {
-            BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Type "
-                             << type;
+            BMCWEB_LOG_ERROR << "Illegal Type " << type;
             messages::propertyUnknown(response->res, type);
             return CreatePIDRet::fail;
         }
@@ -902,8 +901,7 @@
                 "PositiveHysteresis", doubles["PositiveHysteresis"],
                 "NegativeHysteresis", doubles["NegativeHysteresis"]))
         {
-            BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
-                             << it.value().dump();
+            BMCWEB_LOG_ERROR << "Illegal Property " << it.value().dump();
             return CreatePIDRet::fail;
         }
         if (zones)
@@ -911,7 +909,7 @@
             std::vector<std::string> zonesStr;
             if (!getZonesFromJsonReq(response, *zones, zonesStr))
             {
-                BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Zones";
+                BMCWEB_LOG_ERROR << "Illegal Zones";
                 return CreatePIDRet::fail;
             }
             if (chassis.empty() &&
@@ -1009,8 +1007,7 @@
                                           failSafePercent, "MinThermalOutput",
                                           minThermalOutput))
         {
-            BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
-                             << it.value().dump();
+            BMCWEB_LOG_ERROR << "Illegal Property " << it.value().dump();
             return CreatePIDRet::fail;
         }
 
@@ -1021,7 +1018,7 @@
             if (!redfish::json_util::readJson(*chassisContainer, response->res,
                                               "@odata.id", chassisId))
             {
-                BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
+                BMCWEB_LOG_ERROR << "Illegal Property "
                                  << chassisContainer->dump();
                 return CreatePIDRet::fail;
             }
@@ -1059,8 +1056,7 @@
                 "NegativeHysteresis", negativeHysteresis, "Direction",
                 direction))
         {
-            BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
-                             << it.value().dump();
+            BMCWEB_LOG_ERROR << "Illegal Property " << it.value().dump();
             return CreatePIDRet::fail;
         }
 
@@ -1069,7 +1065,7 @@
             std::vector<std::string> zonesStrs;
             if (!getZonesFromJsonReq(response, *zones, zonesStrs))
             {
-                BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Zones";
+                BMCWEB_LOG_ERROR << "Illegal Zones";
                 return CreatePIDRet::fail;
             }
             if (chassis.empty() &&
@@ -1093,8 +1089,7 @@
                 if (!redfish::json_util::readJson(step, response->res, "Target",
                                                   target, "Output", out))
                 {
-                    BMCWEB_LOG_ERROR << "Line:" << __LINE__
-                                     << ", Illegal Property "
+                    BMCWEB_LOG_ERROR << "Illegal Property "
                                      << it.value().dump();
                     return CreatePIDRet::fail;
                 }
@@ -1136,7 +1131,7 @@
     }
     else
     {
-        BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Type " << type;
+        BMCWEB_LOG_ERROR << "Illegal Type " << type;
         messages::propertyUnknown(response->res, type);
         return CreatePIDRet::fail;
     }
@@ -1336,8 +1331,7 @@
                 "FanControllers", fanControllers, "FanZones", fanZones,
                 "StepwiseControllers", stepwiseControllers, "Profile", profile))
         {
-            BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
-                             << data.dump();
+            BMCWEB_LOG_ERROR << "Illegal Property " << data.dump();
             return;
         }
         configuration.emplace_back("PidControllers", std::move(pidControllers));
@@ -1860,8 +1854,7 @@
             std::optional<nlohmann::json> openbmc;
             if (!redfish::json_util::readJson(*oem, res, "OpenBmc", openbmc))
             {
-                BMCWEB_LOG_ERROR << "Line:" << __LINE__ << ", Illegal Property "
-                                 << oem->dump();
+                BMCWEB_LOG_ERROR << "Illegal Property " << oem->dump();
                 return;
             }
             if (openbmc)
@@ -1869,9 +1862,7 @@
                 std::optional<nlohmann::json> fan;
                 if (!redfish::json_util::readJson(*openbmc, res, "Fan", fan))
                 {
-                    BMCWEB_LOG_ERROR << "Line:" << __LINE__
-                                     << ", Illegal Property "
-                                     << openbmc->dump();
+                    BMCWEB_LOG_ERROR << "Illegal Property " << openbmc->dump();
                     return;
                 }
                 if (fan)