From 7a614182acb466908b9893e953e027711f8c554a Mon Sep 17 00:00:00 2001 From: Vernon Mauery Date: Tue, 27 Nov 2018 12:54:52 -0800 Subject: Catch sdbusplus exceptions in IPMI net Missing the correct exception was causing issues with setting the IPV4 address Change-Id: Ieaaacfcbaec82a0c3b110889817a7ceb9cda8d3c Signed-off-by: Dave Cobbley Signed-off-by: Yong Li --- libipmid/utils.cpp | 5 +++-- transporthandler.cpp | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libipmid/utils.cpp b/libipmid/utils.cpp index 4fd219e..3ff79ed 100644 --- a/libipmid/utils.cpp +++ b/libipmid/utils.cpp @@ -358,9 +358,10 @@ void deleteAllDbusObjects(sdbusplus::bus::bus& bus, "Delete"); } } - catch (InternalFailure& e) + catch (sdbusplus::exception::exception& e) { - log("Unable to delete the objects having", + log("sdbusplus exception - Unable to delete the objects", + entry("ERROR=%s", e.what()), entry("INTERFACE=%s", interface.c_str()), entry("SERVICE=%s", serviceRoot.c_str())); } diff --git a/transporthandler.cpp b/transporthandler.cpp index 1662530..ba0772b 100644 --- a/transporthandler.cpp +++ b/transporthandler.cpp @@ -945,7 +945,7 @@ void applyChanges(int channel) } } } - catch (InternalFailure& e) + catch (sdbusplus::exception::exception& e) { log( "Failed to set network data", entry("PREFIX=%d", prefix), -- cgit v1.2.1