From 618027abcf491b0b58f71bfe2b48c55dfb86462e Mon Sep 17 00:00:00 2001 From: Dinesh Chinari Date: Mon, 26 Jun 2017 23:26:50 -0500 Subject: phosphor-fan-presence elog error exception. Implemented elog exception for phosphor fan presence, replacing runtime_errors. Change-Id: I70465060838b2cbaeadccf84ed5924e222ac59e3 Signed-off-by: Dinesh Chinari --- presence/Makefile.am | 6 ++++-- presence/fan_enclosure.cpp | 10 +--------- 2 files changed, 5 insertions(+), 11 deletions(-) (limited to 'presence') diff --git a/presence/Makefile.am b/presence/Makefile.am index b56ed4e..0f7e7dd 100644 --- a/presence/Makefile.am +++ b/presence/Makefile.am @@ -14,10 +14,12 @@ nodist_phosphor_fan_presence_tach_SOURCES = \ phosphor_fan_presence_tach_LDADD = \ $(top_builddir)/libfan.la \ $(SDBUSPLUS_LIBS) \ - $(PHOSPHOR_LOGGING_LIBS) + $(PHOSPHOR_LOGGING_LIBS) \ + ${PHOSPHOR_DBUS_INTERFACES_LIBS} phosphor_fan_presence_tach_CXXFLAGS = \ $(SDBUSPLUS_CFLAGS) \ - $(PHOSPHOR_LOGGING_CFLAGS) + $(PHOSPHOR_LOGGING_CFLAGS) \ + ${PHOSPHOR_DBUS_INTERFACES_CFLAGS} BUILT_SOURCES = fan_detect_defs.cpp diff --git a/presence/fan_enclosure.cpp b/presence/fan_enclosure.cpp index ca97c07..7b412bd 100644 --- a/presence/fan_enclosure.cpp +++ b/presence/fan_enclosure.cpp @@ -67,15 +67,7 @@ void FanEnclosure::updInventory() ObjectMap invObj = getObjectMap(curPresState); // Get inventory manager service name from mapper std::string invService; - try - { - invService = phosphor::fan::util::getInvService(bus); - } - catch (const std::runtime_error& err) - { - log(err.what()); - return; - } + invService = phosphor::fan::util::getInvService(bus); // Update inventory for this fan auto invMsg = bus.new_method_call(invService.c_str(), INVENTORY_PATH, -- cgit v1.2.1