Fix for mapper errors during logging service restart

There was a race condition while calling mapper from led monitoring after
error logs started persisting, to avoid such errors the callout information is
now extracted from the message received as part of interface added signal.

Resolves openbmc/openbmc#1853

Change-Id: Ie913992bdcb3b1cb93677d64331db34202f8ae72
Signed-off-by: Dhruvaraj Subhashchandran <dhruvaraj@in.ibm.com>

1 files changed, 0 insertions, 88 deletions

diff --git a/elog-errors.hpp b/elog-errors.hpp
index 1cc6f4a..95c80e7 100644
--- a/elog-errors.hpp
+++ b/elog-errors.hpp
@@ -9,28 +9,6 @@
 #include <phosphor-logging/log.hpp>
 #include <phosphor-logging/elog.hpp>
 
-namespace sdbusplus
-{
-namespace xyz
-{
-namespace openbmc_project
-{
-namespace Led
-{
-namespace Fru
-{
-namespace Monitor
-{
-namespace Error
-{
-    struct AssociationRetrieveError;
-} // namespace Error
-} // namespace Monitor
-} // namespace Fru
-} // namespace Led
-} // namespace openbmc_project
-} // namespace xyz
-} // namespace sdbusplus
 
 namespace sdbusplus
 {
@@ -174,72 +152,6 @@ namespace openbmc_project
 {
 namespace Led
 {
-namespace Fru
-{
-namespace Monitor
-{
-namespace _AssociationRetrieveError
-{
-
-struct ELOG_ENTRY_PATH
-{
-    static constexpr auto str = "ELOG_ENTRY_PATH=%s";
-    static constexpr auto str_short = "ELOG_ENTRY_PATH";
-    using type = std::tuple<std::decay_t<decltype(str)>,const char*>;
-    explicit constexpr ELOG_ENTRY_PATH(const char* a) : _entry(entry(str, a)) {};
-    type _entry;
-};
-
-}  // namespace _AssociationRetrieveError
-
-struct AssociationRetrieveError : public sdbusplus::exception_t
-{
-    static constexpr auto errName = "xyz.openbmc_project.Led.Fru.Monitor.AssociationRetrieveError";
-    static constexpr auto errDesc = "Error in retrieving the associations from elog entry.";
-    static constexpr auto L = level::INFO;
-    using ELOG_ENTRY_PATH = _AssociationRetrieveError::ELOG_ENTRY_PATH;
-    using metadata_types = std::tuple<ELOG_ENTRY_PATH>;
-
-    const char* name() const noexcept
-    {
-        return errName;
-    }
-
-    const char* description() const noexcept
-    {
-        return errDesc;
-    }
-
-    const char* what() const noexcept
-    {
-        return errName;
-    }
-};
-
-} // namespace Monitor
-} // namespace Fru
-} // namespace Led
-} // namespace openbmc_project
-} // namespace xyz
-
-
-namespace details
-{
-
-template <>
-struct map_exception_type<sdbusplus::xyz::openbmc_project::Led::Fru::Monitor::Error::AssociationRetrieveError>
-{
-    using type = xyz::openbmc_project::Led::Fru::Monitor::AssociationRetrieveError;
-};
-
-}
-
-namespace xyz
-{
-namespace openbmc_project
-{
-namespace Led
-{
 namespace Mapper
 {
 namespace _MethodError