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/host_state_manager.cpp b/host_state_manager.cpp
index 2b435a2..00f41cb 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -44,7 +44,6 @@
sdbusplus::xyz::openbmc_project::State::OperatingSystem::server;
using namespace phosphor::logging;
namespace fs = std::experimental::filesystem;
-using sdbusplus::exception::SdBusError;
using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
// host-shutdown notifies host of shutdown and that leads to host-stop being
@@ -96,7 +95,7 @@
{
this->bus.call_noreply(method);
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
log<level::ERR>("Failed to subscribe to systemd signals",
entry("ERR=%s", e.what()));
@@ -164,7 +163,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;
@@ -182,7 +181,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()));
@@ -264,7 +263,7 @@
return false;
}
}
- catch (const SdBusError& e)
+ catch (const sdbusplus::exception::exception& e)
{
log<level::ERR>("Error in AutoReboot Get", entry("ERROR=%s", e.what()));
return false;