commit 7152edcff6b44cd3b32ced057c1fd2e6ac6402e9
author Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:41:54 2021 -0500
committer Patrick Williams <patrick@stwcx.xyz> Thu Sep 02 09:41:54 2021 -0500
tree 99fd1ab67db553f373d0076b876539fb9e3fc3cd
parent ad73885b724ea826ffc60c23bdbaaab91ee3cb1c

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: I411acc5238da0ad3d14a963c0d1a3bb4791f23ff

fault-monitor/fru-fault-monitor.cpp

diff --git a/fault-monitor/fru-fault-monitor.cpp b/fault-monitor/fru-fault-monitor.cpp
index 35b30ec..885c020 100644
--- a/fault-monitor/fru-fault-monitor.cpp
+++ b/fault-monitor/fru-fault-monitor.cpp
@@ -68,7 +68,7 @@
     {
         mapperResponseMsg.read(mapperResponse);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>(
             "Failed to parse getService mapper response",
@@ -132,7 +132,7 @@
     {
         bus.call_noreply(method);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         // Log an info message, system may not have all the LED Groups defined
         log<level::INFO>("Failed to Assert LED Group",
@@ -152,7 +152,7 @@
     {
         msg.read(objectPath, interfaces);
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Failed to parse created message",
                         entry("ERROR=%s", e.what()),
@@ -228,7 +228,7 @@
         {
             mapperResponseMsg.read(subtree);
         }
-        catch (const sdbusplus::exception::SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::ERR>(
                 "Failed to parse existing callouts subtree message",
@@ -236,7 +236,7 @@
                 entry("REPLY_SIG=%s", mapperResponseMsg.get_signature()));
         }
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         // Just means no log entries at the moment
     }
@@ -273,7 +273,7 @@
         {
             reply.read(assoc);
         }
-        catch (const sdbusplus::exception::SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::ERR>(
                 "Failed to parse existing callouts associations message",

fault-monitor/operational-status-monitor.cpp

diff --git a/fault-monitor/operational-status-monitor.cpp b/fault-monitor/operational-status-monitor.cpp
index 7a6595f..66c6d3f 100644
--- a/fault-monitor/operational-status-monitor.cpp
+++ b/fault-monitor/operational-status-monitor.cpp
@@ -70,7 +70,7 @@
                                            "xyz.openbmc_project.Association",
                                            "endpoints");
     }
-    catch (const sdbusplus::exception::SdBusError& e)
+    catch (const sdbusplus::exception::exception& e)
     {
         log<level::ERR>("Failed to get endpoints property",
                         entry("ERROR=%s", e.what()),
@@ -98,7 +98,7 @@
             dBusHandler.setProperty(path, "xyz.openbmc_project.Led.Group",
                                     "Asserted", assertedValue);
         }
-        catch (const sdbusplus::exception::SdBusError& e)
+        catch (const sdbusplus::exception::exception& e)
         {
             log<level::ERR>("Failed to set Asserted property",
                             entry("ERROR=%s", e.what()),