From ee4c6ebfd9e1697501b6fa0225d684867796a637 Mon Sep 17 00:00:00 2001 From: Marri Devender Rao Date: Thu, 19 Apr 2018 05:51:35 -0500 Subject: Fix callback unit test failure Recently changes has been done in phosphor-logging commit method causing the unit test failure with error message "Error in mapper call". Earlier commit method used to return error but the same has been modified to throw exception now. Fixed to return from the callback method if context is start Change-Id: I606c638bd2d0bc2003af0b284586e53809bbca21 Signed-off-by: Marri Devender Rao --- src/elog.cpp | 6 ++++++ src/elog.hpp | 6 ++++++ 2 files changed, 12 insertions(+) (limited to 'src') diff --git a/src/elog.cpp b/src/elog.cpp index 9cd18c8..ba6e522 100644 --- a/src/elog.cpp +++ b/src/elog.cpp @@ -24,6 +24,12 @@ namespace monitoring void ElogBase::operator()(Context ctx) { + if (ctx == Context::START) + { + // No action should be taken as this call back is being called from + // daemon Startup. + return; + } log(); } diff --git a/src/elog.hpp b/src/elog.hpp index 996fd58..24e2009 100644 --- a/src/elog.hpp +++ b/src/elog.hpp @@ -154,6 +154,12 @@ class ElogWithMetadataCapture : public IndexedCallback */ void operator()(Context ctx) override { + if (ctx == Context::START) + { + // No action should be taken as this call back is being called from + // daemon Startup. + return; + } auto data = captureMetadata(); phosphor::logging::report(metadataType(data.c_str())); -- cgit v1.2.1