tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-30 17:14:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10352 from Icinga/checkable-checkercomponent-fixed-timestamp-debug-logs

Browse Source 
Fixed double output for timestamps in debug log
This commit is contained in:
Yonas Habteab 2025-04-14 12:16:51 +02:00 committed by GitHub
commit 9cc3971288
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/checker/checkercomponent.cpp
View File

@ -199,7 +199,8 @@ void CheckerComponent::CheckThreadProc()
<< "Scheduling info for checkable '" << checkable->GetName() << "' ("
<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", checkable->GetNextCheck()) << "): Object '"
<< csi.Object->GetName() << "', Next Check: "
<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", csi.NextCheck) << "(" << csi.NextCheck << ").";
<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", csi.NextCheck)
<< " (" << std::fixed << std::setprecision(0) << csi.NextCheck << ").";
m_PendingCheckables.insert(csi);

4
lib/icinga/checkable-check.cpp
View File

@ -71,9 +71,11 @@ void Checkable::UpdateNextCheck(const MessageOrigin::Ptr& origin)
double lastCheck = GetLastCheck();
Log(LogDebug, "Checkable")
<< std::fixed << std::setprecision(0)
<< "Update checkable '" << GetName() << "' with check interval '" << GetCheckInterval()
<< "' from last check time at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", (lastCheck < 0 ? 0 : lastCheck))
<< " (" << GetLastCheck() << ") to next check time at " << Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck) << " (" << nextCheck << ").";
<< " (" << lastCheck << ") to next check time at "
<< Utility::FormatDateTime("%Y-%m-%d %H:%M:%S %z", nextCheck) << " (" << nextCheck << ").";
SetNextCheck(nextCheck, false, origin);
}