Added back logging as traces for level_2_chunks

This commit is contained in:
AdenKoperczak 2025-05-07 17:33:44 -04:00
parent 4906800a22
commit 969267b661
No known key found for this signature in database
GPG key ID: 9843017036F62EE7
4 changed files with 21 additions and 26 deletions

View file

@ -766,7 +766,7 @@ void RadarProductManagerImpl::EnableRefresh(
void RadarProductManagerImpl::RefreshData(
std::shared_ptr<ProviderManager> providerManager)
{
// logger_->debug("RefreshData: {}", providerManager->name());
logger_->trace("RefreshData: {}", providerManager->name());
{
std::unique_lock lock(providerManager->refreshTimerMutex_);
@ -846,12 +846,10 @@ void RadarProductManagerImpl::RefreshDataSync(
if (providerManager->refreshEnabled_)
{
/*
logger_->debug(
logger_->trace(
"[{}] Scheduled refresh in {:%M:%S}",
providerManager->name(),
std::chrono::duration_cast<std::chrono::seconds>(interval));
*/
{
providerManager->refreshTimer_.expires_after(interval);
@ -962,9 +960,9 @@ void RadarProductManagerImpl::LoadProviderData(
std::mutex& loadDataMutex,
const std::shared_ptr<request::NexradFileRequest>& request)
{
/*logger_->debug("LoadProviderData: {}, {}",
logger_->trace("LoadProviderData: {}, {}",
providerManager->name(),
scwx::util::TimeString(time));*/
scwx::util::TimeString(time));
LoadNexradFileAsync(
[=, &recordMap, &recordMutex]() -> std::shared_ptr<wsr88d::NexradFile>
@ -980,13 +978,11 @@ void RadarProductManagerImpl::LoadProviderData(
{
existingRecord = it->second.lock();
/*
if (existingRecord != nullptr)
{
logger_->debug(
logger_->trace(
"Data previously loaded, loading from data cache");
}
*/
}
}
@ -1015,7 +1011,7 @@ void RadarProductManager::LoadLevel2Data(
std::chrono::system_clock::time_point time,
const std::shared_ptr<request::NexradFileRequest>& request)
{
// logger_->debug("LoadLevel2Data: {}", scwx::util::TimeString(time));
logger_->trace("LoadLevel2Data: {}", scwx::util::TimeString(time));
p->LoadProviderData(time,
p->level2ProviderManager_,
@ -1445,7 +1441,7 @@ std::shared_ptr<types::RadarProductRecord>
RadarProductManagerImpl::StoreRadarProductRecord(
std::shared_ptr<types::RadarProductRecord> record)
{
// logger_->debug("StoreRadarProductRecord()");
logger_->trace("StoreRadarProductRecord()");
std::shared_ptr<types::RadarProductRecord> storedRecord = nullptr;
@ -1462,12 +1458,11 @@ RadarProductManagerImpl::StoreRadarProductRecord(
{
storedRecord = it->second.lock();
/*
if (storedRecord != nullptr)
{
logger_->debug(
logger_->trace(
"Level 2 product previously loaded, loading from cache");
}*/
}
}
if (storedRecord == nullptr)

View file

@ -170,7 +170,7 @@ void RadarProductLayer::UpdateSweep()
std::try_to_lock);
if (!sweepLock.owns_lock())
{
// logger_->debug("Sweep locked, deferring update");
logger_->trace("Sweep locked, deferring update");
return;
}
logger_->debug("UpdateSweep()");

View file

@ -341,7 +341,7 @@ AwsLevel2ChunksDataProvider::Impl::ListObjects()
{
return {true, newObjects, totalObjects};
}
logger_->debug("ListObjects");
logger_->trace("ListObjects");
lastTimeListed_ = now;
const std::string prefix = radarSite_ + "/";
@ -356,7 +356,7 @@ AwsLevel2ChunksDataProvider::Impl::ListObjects()
if (outcome.IsSuccess())
{
auto& scans = outcome.GetResult().GetCommonPrefixes();
// logger_->debug("Found {} scans", scans.size());
logger_->trace("Found {} scans", scans.size());
if (scans.size() > 0)
{
@ -513,7 +513,7 @@ bool AwsLevel2ChunksDataProvider::Impl::LoadScan(Impl::ScanRecord& scanRecord)
bool hasNew = false;
auto& chunks = listOutcome.GetResult().GetContents();
// logger_->debug("Found {} new chunks.", chunks.size());
logger_->trace("Found {} new chunks.", chunks.size());
for (const auto& chunk : chunks)
{
const std::string& key = chunk.GetKey();
@ -726,7 +726,7 @@ std::pair<size_t, size_t> AwsLevel2ChunksDataProvider::Refresh()
timer.stop();
// NOLINTNEXTLINE(cppcoreguidelines-avoid-magic-numbers) format to 6 digits
// logger_->debug("Refresh() in {}", timer.format(6, "%ws"));
logger_->debug("Refresh() in {}", timer.format(6, "%ws"));
return std::make_pair(newObjects, totalObjects);
}

View file

@ -138,7 +138,7 @@ Ar2vFile::GetElevationScan(rda::DataBlockType dataBlockType,
float elevation,
std::chrono::system_clock::time_point time) const
{
// logger_->debug("GetElevationScan: {} degrees", elevation);
logger_->trace("GetElevationScan: {} degrees", elevation);
std::shared_ptr<rda::ElevationScan> elevationScan = nullptr;
float elevationCut = 0.0f;
@ -273,7 +273,7 @@ bool Ar2vFile::LoadData(std::istream& is)
std::size_t Ar2vFileImpl::DecompressLDMRecords(std::istream& is)
{
// logger_->debug("Decompressing LDM Records");
logger_->trace("Decompressing LDM Records");
std::size_t numRecords = 0;
@ -321,22 +321,22 @@ std::size_t Ar2vFileImpl::DecompressLDMRecords(std::istream& is)
++numRecords;
}
// logger_->debug("Decompressed {} LDM Records", numRecords);
logger_->trace("Decompressed {} LDM Records", numRecords);
return numRecords;
}
void Ar2vFileImpl::ParseLDMRecords()
{
// logger_->debug("Parsing LDM Records");
logger_->trace("Parsing LDM Records");
// std::size_t count = 0;
std::size_t count = 0;
for (auto it = rawRecords_.begin(); it != rawRecords_.end(); it++)
{
std::stringstream& ss = *it;
// logger_->trace("Record {}", count++);
logger_->trace("Record {}", count++);
ParseLDMRecord(ss);
}
@ -445,7 +445,7 @@ void Ar2vFileImpl::ProcessRadarData(
void Ar2vFileImpl::IndexFile()
{
// logger_->debug("Indexing file");
logger_->trace("Indexing file");
for (auto& elevationCut : radarData_)
{