commit b89d619cadbdcea10ba773e4ac9dfdc2efd7dd37
author Sheldon Bailey <baileysh@us.ibm.com> Wed Mar 05 09:33:19 2025 -0600
committer Sheldon Bailey <baileysh@us.ibm.com> Wed Mar 05 13:40:38 2025 -0600
tree 9e0a86afbd30f6072a27e662a9e98c5e621f954e
parent d2b044f935e069f6d30d9a25419efb71b9a73edf

Fix occ_control terminate after OCC reset

Change to wrapper the OccDBusSensors access in a try/catch instead
of terminating on failed access

Change-Id: Ib35c1fbc1f9e01e074ec5ccf84639c1821953654
Signed-off-by: Sheldon Bailey <baileysh@us.ibm.com>

occ_manager.cpp

diff --git a/occ_manager.cpp b/occ_manager.cpp
index 0a00c2e..ff9ff3f 100644
--- a/occ_manager.cpp
+++ b/occ_manager.cpp
@@ -526,7 +526,7 @@
         }
         else
         {
-            lg2::info("OCC{INST} disabled, but currently no active OCCs",
+            lg2::info("OCC{INST} disabled, and no other OCCs are active",
                       "INST", instance);
         }
 
@@ -1172,7 +1172,6 @@
             dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
                 objectPath, {"all_sensors"});
         }
-
         existingSensors[objectPath] = occInstance;
     }
 }
@@ -1284,7 +1283,6 @@
             dbus::OccDBusSensors::getOccDBus().setChassisAssociation(
                 sensorPath, fTypeList);
         }
-
         existingSensors[sensorPath] = id;
     }
     return;
@@ -1370,10 +1368,6 @@
             MyHexNumber =
                 std::round(((MyHexNumber / (PS_DERATING_FACTOR / 100.0))));
 
-            lg2::debug("OCC{ID}: FILE:{FILE} -- {ACWATTS} AC Watts", "ID", id,
-                       "FILE", filePathString + inputSuffix, "ACWATTS",
-                       MyHexNumber);
-
             dbus::OccDBusSensors::getOccDBus().setUnit(
                 sensorPath, "xyz.openbmc_project.Sensor.Value.Unit.Watts");
 
@@ -1389,11 +1383,8 @@
                     sensorPath, {"all_sensors"});
             }
 
+            existingSensors[sensorPath] = id;
         } // End Extended Power Sensors.
-        // else put in other label formats here to dbus.
-
-        existingSensors[sensorPath] = id;
-
     } // End For loop on files for Extended Sensors.
     return;
 }
@@ -1440,6 +1431,7 @@
     {
         // Read temperature sensors
         readTempSensors(sensorPath, id);
+        // Read Extended sensors
         readExtnSensors(sensorPath, id);
 
         if (occ->isMasterOcc())