From 6088558429fbe5f723783b4220b6ac1c9096cde9 Mon Sep 17 00:00:00 2001
From: Marri Devender Rao <devenrao@in.ibm.com>
Date: Tue, 7 Nov 2017 04:58:14 -0600
Subject: Fix up InternalFailure to include metadata

Scope is to add missing logs for InternalFailure errors

Change-Id: I12c958127c1303fba0057914682e651457a0e547
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
---
 sdevent/event.hpp  | 23 ++++++++++++++++++-----
 sdevent/io.hpp     |  6 +++++-
 sdevent/source.hpp | 11 +++++++++--
 3 files changed, 32 insertions(+), 8 deletions(-)

(limited to 'sdevent')

diff --git a/sdevent/event.hpp b/sdevent/event.hpp
index 53776ae..2058462 100644
--- a/sdevent/event.hpp
+++ b/sdevent/event.hpp
@@ -42,6 +42,8 @@ using Event = std::unique_ptr<sd_event, EventDeleter>;
 
 } // namespace details
 
+using namespace phosphor::logging;
+
 /** @class Event
  *  @brief Provides C++ bindings to the sd_event_* class functions.
  */
@@ -92,7 +94,9 @@ class Event
             auto rc = sd_event_loop(evt.get());
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_loop",
+                        entry("RC=%d", rc));
+                elog<InternalFailure>();
             }
         }
 
@@ -102,7 +106,10 @@ class Event
             auto rc = sd_event_exit(evt.get(), status);
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_exit",
+                        entry("RC=%d", rc),
+                        entry("STATUS=%d", status));
+                elog<InternalFailure>();
             }
         }
 
@@ -113,7 +120,9 @@ class Event
             auto rc = sd_event_get_exit_code(evt.get(), &status);
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_get_exit_code",
+                        entry("RC=%d", rc));
+                elog<InternalFailure>();
             }
 
             return status;
@@ -134,7 +143,9 @@ class Event
             auto rc = sd_event_now(evt.get(), CLOCK_MONOTONIC, &usec);
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_now",
+                        entry("RC=%d", rc));
+                elog<InternalFailure>();
             }
 
             microseconds d(usec);
@@ -172,7 +183,9 @@ inline Event newDefault()
     auto rc = sd_event_default(&e);
     if (rc < 0)
     {
-        phosphor::logging::elog<InternalFailure>();
+        log<level::ERR>("Error in call to sd_event_default",
+                entry("RC=%d", rc));
+        elog<InternalFailure>();
     }
 
     return Event(e, std::false_type());
diff --git a/sdevent/io.hpp b/sdevent/io.hpp
index 93625a0..f511cf0 100644
--- a/sdevent/io.hpp
+++ b/sdevent/io.hpp
@@ -17,6 +17,7 @@ namespace event
 namespace io
 {
 
+using namespace phosphor::logging;
 /** @class IO
  *  @brief Provides C++ bindings to the sd_event_source* io functions.
  */
@@ -67,7 +68,10 @@ class IO
                 cb.get());
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_add_io",
+                        entry("RC=%d", rc),
+                        entry("FD=%d", fd));
+                elog<InternalFailure>();
             }
 
             src = decltype(src){source, std::false_type()};
diff --git a/sdevent/source.hpp b/sdevent/source.hpp
index be3a892..e90efd4 100644
--- a/sdevent/source.hpp
+++ b/sdevent/source.hpp
@@ -32,6 +32,8 @@ using source = std::unique_ptr<sd_event_source, SourceDeleter>;
 
 } // namespace details
 
+using namespace phosphor::logging;
+
 /** @class Source
  *  @brief Provides C++ bindings to the sd_event_source* functions.
  */
@@ -83,7 +85,9 @@ class Source
             auto rc = sd_event_source_get_enabled(src.get(), &enabled);
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_source_get_enabled",
+                        entry("RC=%d", rc));
+                elog<InternalFailure>();
             }
 
             return enabled;
@@ -95,7 +99,10 @@ class Source
             auto rc = sd_event_source_set_enabled(src.get(), enable);
             if (rc < 0)
             {
-                phosphor::logging::elog<InternalFailure>();
+                log<level::ERR>("Error in call to sd_event_source_set_enabled",
+                        entry("RC=%d", rc),
+                        entry("ENABLE=%d", enable));
+                elog<InternalFailure>();
             }
         }
 
-- 
cgit v1.2.1