AuroraSupport/AuroraRuntime
2
1
Fork 0
Code Issues 27 Pull Requests Releases Wiki Activity

[*] fixed logic in dirlogarchive

Browse Source 
todo: get around to improving dirlogarchive
This commit is contained in:
Reece Wilson 2023-07-06 21:26:29 +01:00
parent 72c38548c0
commit 5f9fcce0a1
1 changed files with 21 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
Source/Logging/Sinks/DirLogArchive.cpp
View File

@ -17,7 +17,7 @@ namespace Aurora::Logging::Sinks
AuList<AuPair<AuString, AuIOFS::Stat>> fileMeta; AuList<AuPair<AuString, AuIOFS::Stat>> fileMeta;
AuUInt64 qwSize {}; AuUInt64 qwSize {};
auto doScan = [&]() auto doScan = [&](bool bOrder)
{ {
files.clear(); files.clear();
fileMeta.clear(); fileMeta.clear();
@ -33,16 +33,23 @@ namespace Aurora::Logging::Sinks
qwSize += stat.uSize; qwSize += stat.uSize;
} }
std::sort(fileMeta.begin(), fileMeta.end(), [](AuPair<AuString, AuIOFS::Stat> a, AuPair<AuString, AuIOFS::Stat> b) std::sort(fileMeta.begin(), fileMeta.end(), [=](AuPair<AuString, AuIOFS::Stat> a, AuPair<AuString, AuIOFS::Stat> b)
{ {
return AuGet<1>(a).modifiedNs < AuGet<1>(b).modifiedNs; if (bOrder)
{
return AuGet<1>(a).modifiedNs < AuGet<1>(b).modifiedNs;
}
else
{
return AuGet<1>(a).modifiedNs > AuGet<1>(b).modifiedNs;
}
}); });
}; };
doScan();
if (logger.uMaxLogsOrZeroBeforeCompress) if (logger.uMaxLogsOrZeroBeforeCompress)
{ {
doScan(false);
if (fileMeta.size() > logger.uMaxLogsOrZeroBeforeCompress) if (fileMeta.size() > logger.uMaxLogsOrZeroBeforeCompress)
{ {
for (AuUInt i = logger.uMaxLogsOrZeroBeforeCompress; i < fileMeta.size(); i++) for (AuUInt i = logger.uMaxLogsOrZeroBeforeCompress; i < fileMeta.size(); i++)
@ -57,14 +64,14 @@ namespace Aurora::Logging::Sinks
} }
} }
doScan();
} }
} }
if (logger.uMaxFileTimeInDeltaMSOrZeroBeforeCompress) if (logger.uMaxFileTimeInDeltaMSOrZeroBeforeCompress)
{ {
doScan(true);
auto qwMaxTime = AuTime::CurrentClockMS() - logger.uMaxFileTimeInDeltaMSOrZeroBeforeCompress; auto qwMaxTime = AuTime::CurrentClockMS() - logger.uMaxFileTimeInDeltaMSOrZeroBeforeCompress;
bool bRescan {};
for (AuUInt i = 0; i < fileMeta.size(); i++) for (AuUInt i = 0; i < fileMeta.size(); i++)
{ {
@ -78,20 +85,13 @@ namespace Aurora::Logging::Sinks
{ {
AuIOFS::Remove(path); AuIOFS::Remove(path);
} }
bRescan = true;
} }
} }
if (bRescan)
{
doScan();
}
} }
if (logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeCompress) if (logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeCompress)
{ {
bool bRescan {}; doScan(false);
if (qwSize > logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeCompress) if (qwSize > logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeCompress)
{ {
@ -115,33 +115,26 @@ namespace Aurora::Logging::Sinks
{ {
AuIOFS::Remove(path); AuIOFS::Remove(path);
} }
bRescan = true;
} }
} }
if (bRescan)
{
doScan();
}
} }
if (logger.uMaxLogsOrZeroBeforeDelete) if (logger.uMaxLogsOrZeroBeforeDelete)
{ {
doScan(false);
if (fileMeta.size() > logger.uMaxLogsOrZeroBeforeDelete) if (fileMeta.size() > logger.uMaxLogsOrZeroBeforeDelete)
{ {
for (AuUInt i = logger.uMaxLogsOrZeroBeforeDelete; i < fileMeta.size(); i++) for (AuUInt i = logger.uMaxLogsOrZeroBeforeDelete; i < fileMeta.size(); i++)
{ {
AuIOFS::Remove(baseLogPath + "/" + fileMeta[i].first); AuIOFS::Remove(baseLogPath + "/" + fileMeta[i].first);
} }
doScan();
} }
} }
if (logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeDelete) if (logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeDelete)
{ {
bool bRescan {}; doScan(false);
if (qwSize > logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeDelete) if (qwSize > logger.uMaxCumulativeFileSizeInMiBOrZeroBeforeDelete)
{ {
@ -160,20 +153,15 @@ namespace Aurora::Logging::Sinks
if (AuIOFS::Remove(baseLogPath + "/" + fileMeta[i].first)) if (AuIOFS::Remove(baseLogPath + "/" + fileMeta[i].first))
{ {
qwSize -= fileMeta[i].second.uSize; qwSize -= fileMeta[i].second.uSize;
bRescan = true;
} }
} }
}
if (bRescan)
{
doScan();
} }
} }
if (logger.uMaxFileTimeInDeltaMSOrZeroBeforeDelete) if (logger.uMaxFileTimeInDeltaMSOrZeroBeforeDelete)
{ {
doScan(true);
auto qwMaxTime = AuTime::CurrentClockMS() - logger.uMaxFileTimeInDeltaMSOrZeroBeforeDelete; auto qwMaxTime = AuTime::CurrentClockMS() - logger.uMaxFileTimeInDeltaMSOrZeroBeforeDelete;
for (AuUInt i = 0; i < fileMeta.size(); i++) for (AuUInt i = 0; i < fileMeta.size(); i++)