commit 2f60aaeb704dfb6712610b38ec1f44a1ee6eca6b
author Andrew Geissler <geissonator@yahoo.com> Thu Sep 12 13:25:21 2019 -0500
committer Andrew Geissler <geissonator@yahoo.com> Mon Sep 30 13:19:11 2019 +0000
tree b8ec901f8d2f04bdda2bf07346dbe1284a77e932
parent 9b8af4f2cb159070cd60f6c385e7ad56331171f7

Make D-bus systemd error handling consistent

Make consistent with the extra error handling added to the
chassis_state_manager.cpp code

Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: I144a692a0472b1db9b45dc14444dd39081c7387a

bmc_state_manager.cpp

diff --git a/bmc_state_manager.cpp b/bmc_state_manager.cpp
index 92d9ef8..1ab3f7e 100644
--- a/bmc_state_manager.cpp
+++ b/bmc_state_manager.cpp
@@ -1,8 +1,10 @@
 #include <cassert>
 #include <phosphor-logging/log.hpp>
+#include <phosphor-logging/elog-errors.hpp>
 #include <sdbusplus/exception.hpp>
 #include <sys/sysinfo.h>
 #include "bmc_state_manager.hpp"
+#include "xyz/openbmc_project/Common/error.hpp"
 
 namespace phosphor
 {
@@ -16,6 +18,7 @@
 
 using namespace phosphor::logging;
 using sdbusplus::exception::SdBusError;
+using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
 
 constexpr auto obmcStandbyTarget = "multi-user.target";
 constexpr auto signalDone = "done";
@@ -115,7 +118,9 @@
     }
     catch (const SdBusError& e)
     {
-        log<level::INFO>("Error in Subscribe", entry("ERROR=%s", e.what()));
+        log<level::ERR>("Failed to subscribe to systemd signals",
+                        entry("ERR=%s", e.what()));
+        elog<InternalFailure>();
     }
 
     return;

host_state_manager.cpp

diff --git a/host_state_manager.cpp b/host_state_manager.cpp
index 7d661dd..425e5c8 100644
--- a/host_state_manager.cpp
+++ b/host_state_manager.cpp
@@ -36,6 +36,7 @@
 using namespace phosphor::logging;
 namespace fs = std::experimental::filesystem;
 using sdbusplus::exception::SdBusError;
+using sdbusplus::xyz::openbmc_project::Common::Error::InternalFailure;
 
 // host-shutdown notifies host of shutdown and that leads to host-stop being
 // called so initiate a host shutdown with the -shutdown target and consider the
@@ -77,8 +78,16 @@
 {
     auto method = this->bus.new_method_call(SYSTEMD_SERVICE, SYSTEMD_OBJ_PATH,
                                             SYSTEMD_INTERFACE, "Subscribe");
-    this->bus.call_noreply(method);
-
+    try
+    {
+        this->bus.call_noreply(method);
+    }
+    catch (const SdBusError& e)
+    {
+        log<level::ERR>("Failed to subscribe to systemd signals",
+                        entry("ERR=%s", e.what()));
+        elog<InternalFailure>();
+    }
     return;
 }