From 17792cda3aa968116998391ef0982d7a9989c8da Mon Sep 17 00:00:00 2001
From: Matthew Barth <msbarth@us.ibm.com>
Date: Thu, 10 May 2018 11:39:46 -0500
Subject: cooling-type: Use lookupAndCallMethod

Have phosphor-cooling-type fail with a DBusMethodError exception when a
failure occurs on updating inventory.

Resolves: openbmc/openbmc#2628

Tested:
    Cooling type properties still set correctly

Change-Id: Ia7e3379fc7d75c70e9c71d4f940f9da84b9f5774
Signed-off-by: Matthew Barth <msbarth@us.ibm.com>
---
 cooling-type/main.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'cooling-type/main.cpp')

diff --git a/cooling-type/main.cpp b/cooling-type/main.cpp
index 288f1b9..f690f80 100644
--- a/cooling-type/main.cpp
+++ b/cooling-type/main.cpp
@@ -4,6 +4,7 @@
 #include <phosphor-logging/log.hpp>
 #include "argument.hpp"
 #include "cooling_type.hpp"
+#include "sdbusplus.hpp"
 
 using namespace phosphor::cooling::type;
 using namespace phosphor::fan::util;
@@ -63,7 +64,15 @@ int main(int argc, char* argv[])
             coolingType.updateInventory(objpath);
             rc = 0;
         }
-
+        catch (DBusMethodError& dme)
+        {
+            rc = -1;
+            log<level::ERR>("Uncaught DBus method failure exception",
+                    entry("BUSNAME=%s", dme.busName.c_str()),
+                    entry("PATH=%s", dme.path.c_str()),
+                    entry("INTERFACE=%s", dme.interface.c_str()),
+                    entry("METHOD=%s", dme.method.c_str()));
+        }
         catch (std::exception& err)
         {
             rc = -1;
-- 
cgit v1.2.1