exception: switch to public sdbus exception
SdBusError was intended to be a private error type inside sdbusplus.
Switch all catch locations to use the general sdbusplus::exception type.
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ifa2391f2f582cb2cf16dc85012a05e1f4f6659fd
diff --git a/chassis_state_manager.cpp b/chassis_state_manager.cpp
index a424ebf..71f9134 100644
--- a/chassis_state_manager.cpp
+++ b/chassis_state_manager.cpp
@@ -29,7 +29,6 @@
namespace server = sdbusplus::xyz::openbmc_project::State::server;
using namespace phosphor::logging;
-using sdbusplus::exception::SdBusError;
using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
using sdbusplus::xyz::openbmc_project::State::Shutdown::Power::Error::Blackout;
constexpr auto CHASSIS_STATE_POWEROFF_TGT = "obmc-chassis-poweroff@0.target";
@@ -64,7 +63,7 @@
SYSTEMD_SERVICE, SYSTEMD_OBJ_PATH, SYSTEMD_INTERFACE, "Subscribe");
this->bus.call(method);
}
- catch (const sdbusplus::exception::SdBusError& ex)
+ catch (const sdbusplus::exception::exception& ex)
{
log<level::ERR>("Failed to subscribe to systemd signals",
entry("ERR=%s", ex.what()));
@@ -117,7 +116,7 @@
}
}
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
// It's acceptable for the pgood state service to not be available
// since it will notify us of the pgood state when it comes up.
@@ -173,7 +172,7 @@
auto result = this->bus.call(method);
result.read(unitTargetPath);
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
log<level::ERR>("Error in GetUnit call", entry("ERROR=%s", e.what()));
return false;
@@ -191,7 +190,7 @@
auto result = this->bus.call(method);
result.read(currentState);
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
log<level::ERR>("Error in ActiveState Get",
entry("ERROR=%s", e.what()));
@@ -217,7 +216,7 @@
uint32_t newStateID{};
msg.read(newStateID, newStateObjPath, newStateUnit, newStateResult);
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
log<level::ERR>("Error in state change - bad encoding",
entry("ERROR=%s", e.what()),