sven/libicsneo
1
0
Fork 0
mirror of https://github.com/intrepidcs/libicsneo.git synced 2026-08-05 01:18:36 +02:00
Code Issues Projects Releases Wiki Activity

Events are now removed purely in chronological order if overflowing

Browse Source
This commit is contained in:
EricLiu2000
2019-06-27 18:04:59 -04:00
parent 70d5b4f5b5
commit e3517767cb
4 changed files with 35 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/icsneocpp/eventmanager.cpp
+5 -45
View File
@@ -86,59 +86,19 @@ bool EventManager::enforceLimit() {
size_t amountToRemove = events.size() + 1 - eventLimit;
discardLeastSevere(amountToRemove);
discardOldest(amountToRemove);
return true;
}
APIEvent::Severity EventManager::lowestCurrentSeverity() const {
if(events.empty())
return APIEvent::Severity(0);
APIEvent::Severity lowest = APIEvent::Severity::Error;
auto it = events.begin();
while(it != events.end()) {
if((*it).getSeverity() < lowest)
lowest = (*it).getSeverity();
it++;
if(lowest == APIEvent::Severity::EventInfo)
return lowest;
}
return lowest;
}
void EventManager::discardLeastSevere(size_t count) {
void EventManager::discardOldest(size_t count) {
if(count == 0)
return;
// Erase needed Info level events, starting from the beginning
EventFilter infoFilter(APIEvent::Severity::EventInfo);
auto it = events.begin();
while(it != events.end()) {
if(infoFilter.match(*it)) {
it = events.erase(it);
if(--count == 0)
break;
} else {
it++;
}
it = events.erase(it);
if(--count == 0)
break;
}
// Erase needed Warning level events, starting from the beginning
if(count != 0) {
EventFilter warningFilter(APIEvent::Severity::EventWarning);
it = events.begin();
while(it != events.end()) {
if(warningFilter.match(*it)) {
it = events.erase(it);
if(--count == 0)
break;
} else {
it++;
}
}
}
// No need to check for Error level events, as they are not stored in the list of events.
}