summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVernon Mauery <vernon.mauery@linux.intel.com>2018-11-27 12:54:52 -0800
committerVernon Mauery <vernon.mauery@linux.intel.com>2019-04-04 22:49:51 +0000
commit7a614182acb466908b9893e953e027711f8c554a (patch)
tree8cf861bc7196eab6dbee7fce2a0bab7d38f8b83e
parent0120b68041d58b5fb513b78eaf73dc6ae155df9a (diff)
downloadphosphor-host-ipmid-7a614182acb466908b9893e953e027711f8c554a.zip
phosphor-host-ipmid-7a614182acb466908b9893e953e027711f8c554a.tar.gz
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 <david.j.cobbley@linux.intel.com> Signed-off-by: Yong Li <yong.b.li@linux.intel.com>
-rw-r--r--libipmid/utils.cpp5
-rw-r--r--transporthandler.cpp2
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<level::INFO>("Unable to delete the objects having",
+ log<level::INFO>("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<level::ERR>(
"Failed to set network data", entry("PREFIX=%d", prefix),
OpenPOWER on IntegriCloud