Removed Debug logs from user-view
This commit is contained in:
+11
-8
@@ -46,7 +46,6 @@ std::vector<std::string> wrapText(TTF_Font* font, const std::string& text, float
|
||||
const char* filterLevelToString(LogViewerPage::FilterLevel lvl) {
|
||||
switch (lvl) {
|
||||
case LogViewerPage::FilterLevel::All: return "ALL";
|
||||
case LogViewerPage::FilterLevel::Debug: return "DEBUG";
|
||||
case LogViewerPage::FilterLevel::Info: return "INFO";
|
||||
case LogViewerPage::FilterLevel::Warning: return "WARNING";
|
||||
case LogViewerPage::FilterLevel::Error: return "ERROR";
|
||||
@@ -87,11 +86,11 @@ void LogViewerPage::refreshLogs() {
|
||||
using namespace radiantwave::logger;
|
||||
|
||||
if (filterLevel_ == FilterLevel::All) {
|
||||
rawEntries_ = Logger::instance().getEntries();
|
||||
// Debug logs are stored but never displayed; show everything else.
|
||||
rawEntries_ = Logger::instance().getEntriesFiltered(LogLevel::Info, false);
|
||||
} else {
|
||||
LogLevel targetLvl = LogLevel::Info;
|
||||
if (filterLevel_ == FilterLevel::Debug) targetLvl = LogLevel::Debug;
|
||||
else if (filterLevel_ == FilterLevel::Info) targetLvl = LogLevel::Info;
|
||||
if (filterLevel_ == FilterLevel::Info) targetLvl = LogLevel::Info;
|
||||
else if (filterLevel_ == FilterLevel::Warning) targetLvl = LogLevel::Warning;
|
||||
else if (filterLevel_ == FilterLevel::Error) targetLvl = LogLevel::Error;
|
||||
else if (filterLevel_ == FilterLevel::Fatal) targetLvl = LogLevel::Fatal;
|
||||
@@ -99,6 +98,11 @@ void LogViewerPage::refreshLogs() {
|
||||
rawEntries_ = Logger::instance().getEntriesFiltered(targetLvl, true);
|
||||
}
|
||||
|
||||
// Defense in depth: Debug entries must never reach the viewer.
|
||||
rawEntries_.erase(std::remove_if(rawEntries_.begin(), rawEntries_.end(),
|
||||
[](const LogEntry& e) { return e.level == LogLevel::Debug; }),
|
||||
rawEntries_.end());
|
||||
|
||||
if (sortOrder_ == SortOrder::NewestFirst) {
|
||||
std::sort(rawEntries_.begin(), rawEntries_.end(), [](const LogEntry& a, const LogEntry& b) {
|
||||
return a.timestamp > b.timestamp;
|
||||
@@ -119,11 +123,11 @@ void LogViewerPage::handleEvent(const SDL_Event& event) {
|
||||
SDL_Keycode key = event.key.key;
|
||||
|
||||
if (key == SDLK_L || key == SDLK_F2 || key == SDLK_RIGHT) {
|
||||
filterLevel_ = static_cast<FilterLevel>((static_cast<int>(filterLevel_) + 1) % 6);
|
||||
filterLevel_ = static_cast<FilterLevel>((static_cast<int>(filterLevel_) + 1) % 5);
|
||||
scrollOffset_ = 0;
|
||||
refreshLogs();
|
||||
} else if (key == SDLK_LEFT) {
|
||||
filterLevel_ = static_cast<FilterLevel>((static_cast<int>(filterLevel_) - 1 + 6) % 6);
|
||||
filterLevel_ = static_cast<FilterLevel>((static_cast<int>(filterLevel_) - 1 + 5) % 5);
|
||||
scrollOffset_ = 0;
|
||||
refreshLogs();
|
||||
} else if (key == SDLK_S || key == SDLK_F3) {
|
||||
@@ -256,8 +260,7 @@ void LogViewerPage::rebuildWrapped(float maxLineWidth) {
|
||||
std::string fullLineStr = "[" + timeStr + "] [" + std::string(logLevelToString(entry.level)) + "] [" + entry.component + "] " + entry.message;
|
||||
|
||||
SDL_Color levelColor = {255, 255, 255, 255};
|
||||
if (entry.level == LogLevel::Debug) levelColor = {160, 160, 160, 255};
|
||||
else if (entry.level == LogLevel::Info) levelColor = {255, 255, 255, 255};
|
||||
if (entry.level == LogLevel::Info) levelColor = {255, 255, 255, 255};
|
||||
else if (entry.level == LogLevel::Warning) levelColor = {255, 200, 0, 255};
|
||||
else if (entry.level == LogLevel::Error) levelColor = {255, 80, 80, 255};
|
||||
else if (entry.level == LogLevel::Fatal) levelColor = {255, 60, 180, 255};
|
||||
|
||||
Reference in New Issue
Block a user