mirror of
https://github.com/nasa/fprime.git
synced 2025-12-11 13:54:34 -06:00
d911fb903f
* Add event ID filter to PassiveConsoleTextLogger * Add event ID filter to ActiveTextLogger * Add const qualifier to filtered event list pointers * Fix assert argument types * Fix clang format errors * Fix copy-paste error on include file Co-authored-by: Thomas Boyer-Chammard <49786685+thomas-bc@users.noreply.github.com> * Add missing initialization to ActiveTextLogger constructor --------- Co-authored-by: Ian Brault <ian.r.brault@jpl.nasa.gov> Co-authored-by: Thomas Boyer-Chammard <49786685+thomas-bc@users.noreply.github.com> Co-authored-by: M Starch <LeStarch@googlemail.com>
69 lines
2.6 KiB
C++
69 lines
2.6 KiB
C++
#include <Fw/FPrimeBasicTypes.hpp>
|
|
#include <Fw/Logger/Logger.hpp>
|
|
#include <Fw/Types/Assert.hpp>
|
|
#include <Svc/PassiveConsoleTextLogger/ConsoleTextLoggerImpl.hpp>
|
|
|
|
namespace Svc {
|
|
static_assert(std::numeric_limits<FwSizeType>::max() >= PASSIVE_TEXT_LOGGER_ID_FILTER_SIZE,
|
|
"PASSIVE_TEXT_LOGGER_ID_FILTER_SIZE must fit within range of FwSizeType");
|
|
|
|
ConsoleTextLoggerImpl::ConsoleTextLoggerImpl(const char* compName)
|
|
: PassiveTextLoggerComponentBase(compName), m_numFilteredIDs(0) {}
|
|
|
|
ConsoleTextLoggerImpl::~ConsoleTextLoggerImpl() {}
|
|
|
|
void ConsoleTextLoggerImpl::configure(const FwEventIdType* filteredIds, FwSizeType count) {
|
|
FW_ASSERT(count < PASSIVE_TEXT_LOGGER_ID_FILTER_SIZE, static_cast<FwAssertArgType>(count),
|
|
PASSIVE_TEXT_LOGGER_ID_FILTER_SIZE);
|
|
|
|
this->m_numFilteredIDs = count;
|
|
for (FwSizeType entry = 0; entry < count; entry++) {
|
|
this->m_filteredIDs[entry] = filteredIds[entry];
|
|
}
|
|
}
|
|
|
|
void ConsoleTextLoggerImpl::TextLogger_handler(FwIndexType portNum,
|
|
FwEventIdType id,
|
|
Fw::Time& timeTag,
|
|
const Fw::LogSeverity& severity,
|
|
Fw::TextLogString& text) {
|
|
// Check event ID filters
|
|
for (FwSizeType i = 0; i < this->m_numFilteredIDs; i++) {
|
|
if (this->m_filteredIDs[i] == id) {
|
|
return;
|
|
}
|
|
}
|
|
|
|
const char* severityString = nullptr;
|
|
switch (severity.e) {
|
|
case Fw::LogSeverity::FATAL:
|
|
severityString = "FATAL";
|
|
break;
|
|
case Fw::LogSeverity::WARNING_HI:
|
|
severityString = "WARNING_HI";
|
|
break;
|
|
case Fw::LogSeverity::WARNING_LO:
|
|
severityString = "WARNING_LO";
|
|
break;
|
|
case Fw::LogSeverity::COMMAND:
|
|
severityString = "COMMAND";
|
|
break;
|
|
case Fw::LogSeverity::ACTIVITY_HI:
|
|
severityString = "ACTIVITY_HI";
|
|
break;
|
|
case Fw::LogSeverity::ACTIVITY_LO:
|
|
severityString = "ACTIVITY_LO";
|
|
break;
|
|
case Fw::LogSeverity::DIAGNOSTIC:
|
|
severityString = "DIAGNOSTIC";
|
|
break;
|
|
default:
|
|
severityString = "SEVERITY ERROR";
|
|
break;
|
|
}
|
|
Fw::Logger::log("EVENT: (%" PRI_FwEventIdType ") (%" PRI_FwTimeBaseStoreType ":%" PRIu32 ",%" PRIu32 ") %s: %s\n",
|
|
id, static_cast<FwTimeBaseStoreType>(timeTag.getTimeBase()), timeTag.getSeconds(),
|
|
timeTag.getUSeconds(), severityString, text.toChar());
|
|
}
|
|
} // namespace Svc
|