commit 0a675215d6a6d2eb13e030ba0f618a4691de58d4
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:49:43 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:49:43 2021 -0500
tree e56d9b8f86d3bdc0f47d5eaf03dee4bdb759922f
parent 54d72838a170f5637a5ce38dcb6b0addd4af06a6

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

bmc_state_manager.cpp

diff --git a/bmc_state_manager.cpp b/bmc_state_manager.cpp
index 3fbe4bf..fb15f8f 100644
--- a/bmc_state_manager.cpp
+++ b/bmc_state_manager.cpp
@@ -21,7 +21,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;
 
 constexpr auto obmcStandbyTarget = "multi-user.target";
@@ -52,7 +51,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;
@@ -72,7 +71,7 @@
         // Is obmc-standby.target active or inactive?
         result.read(currentState);
     }
-    catch (const SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::INFO>("Error in ActiveState Get",
                          entry("ERROR=%s", e.what()));
@@ -94,7 +93,7 @@
             this->bus.call(method);
             this->stateSignal.release();
         }
-        catch (const SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::INFO>("Error in Unsubscribe",
                              entry("ERROR=%s", e.what()));
@@ -119,7 +118,7 @@
     {
         this->bus.call(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()));
@@ -141,7 +140,7 @@
         {
             this->bus.call(method);
         }
-        catch (const SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::INFO>("Error in HardReboot",
                              entry("ERROR=%s", e.what()));
@@ -167,7 +166,7 @@
         {
             this->bus.call(method);
         }
-        catch (const SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::INFO>("Error in StartUnit - replace-irreversibly",
                              entry("ERROR=%s", e.what()));
@@ -202,7 +201,7 @@
             this->bus.call(method);
             this->stateSignal.release();
         }
-        catch (const SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::INFO>("Error in Unsubscribe",
                              entry("ERROR=%s", e.what()));