tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-11-23 15:20:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use 64bit unsigned integer for Replay log timestamps

Browse Source
This commit is contained in:
Johannes Schmidt 2025-11-19 09:38:52 +01:00
parent f42510f981
commit 9a69dd9a45
2 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/remote/apilistener.cpp
View File

@ -1004,11 +1004,11 @@ void ApiListener::ApiTimerHandler()
{ {
double now = Utility::GetTime(); double now = Utility::GetTime();
std::vector<int> files; std::vector<std::uint64_t> files;
Utility::Glob(GetApiDir() + "log/*", [&files](const String& file) { LogGlobHandler(files, file); }, GlobFile); Utility::Glob(GetApiDir() + "log/*", [&files](const String& file) { LogGlobHandler(files, file); }, GlobFile);
std::sort(files.begin(), files.end()); std::sort(files.begin(), files.end());
for (int ts : files) { for (auto ts : files) {
bool need = false; bool need = false;
auto localZone (GetLocalEndpoint()->GetZone()); auto localZone (GetLocalEndpoint()->GetZone());
@ -1468,7 +1468,7 @@ void ApiListener::RotateLogFile()
ts = Utility::GetTime(); ts = Utility::GetTime();
String oldpath = GetApiDir() + "log/current"; String oldpath = GetApiDir() + "log/current";
String newpath = GetApiDir() + "log/" + Convert::ToString(static_cast<int>(ts)+1); String newpath = GetApiDir() + "log/" + Convert::ToString(static_cast<std::uint64_t>(ts)+1);
// If the log is being rotated more than once per second, // If the log is being rotated more than once per second,
// don't overwrite the previous one, but silently deny rotation. // don't overwrite the previous one, but silently deny rotation.
@ -1486,22 +1486,20 @@ void ApiListener::RotateLogFile()
} }
} }
void ApiListener::LogGlobHandler(std::vector<int>& files, const String& file) void ApiListener::LogGlobHandler(std::vector<std::uint64_t>& files, const String& file)
{ {
String name = Utility::BaseName(file); String name = Utility::BaseName(file);
if (name == "current") if (name == "current")
return; return;
int ts;
try { try {
ts = Convert::ToLong(name); files.emplace_back(boost::lexical_cast<std::uint64_t>(name));
} catch (const std::exception&) { } catch (const std::exception& ex) {
Log(LogCritical, "ApiListener")
<< "Error converting log file name " << file << " to uint64: " << ex.what();
return; return;
} }
files.push_back(ts);
} }
void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client) void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
@ -1548,19 +1546,19 @@ void ApiListener::ReplayLog(const JsonRpcConnection::Ptr& client)
count = 0; count = 0;
std::vector<int> files; std::vector<std::uint64_t> files;
Utility::Glob(GetApiDir() + "log/*", [&files](const String& file) { LogGlobHandler(files, file); }, GlobFile); Utility::Glob(GetApiDir() + "log/*", [&files](const String& file) { LogGlobHandler(files, file); }, GlobFile);
std::sort(files.begin(), files.end()); std::sort(files.begin(), files.end());
std::vector<std::pair<int, String>> allFiles; std::vector<std::pair<std::uint64_t, String>> allFiles;
for (int ts : files) { for (auto ts : files) {
if (ts >= peer_ts) { if (ts >= peer_ts) {
allFiles.emplace_back(ts, GetApiDir() + "log/" + Convert::ToString(ts)); allFiles.emplace_back(ts, GetApiDir() + "log/" + Convert::ToString(ts));
} }
} }
allFiles.emplace_back(Utility::GetTime() + 1, GetApiDir() + "log/current"); allFiles.emplace_back(static_cast<std::uint64_t>(Utility::GetTime()) + 1, GetApiDir() + "log/current");
for (auto& file : allFiles) { for (auto& file : allFiles) {
Log(LogNotice, "ApiListener") Log(LogNotice, "ApiListener")

2
lib/remote/apilistener.hpp
View File

@ -230,7 +230,7 @@ private:
void OpenLogFile(); void OpenLogFile();
void RotateLogFile(); void RotateLogFile();
void CloseLogFile(); void CloseLogFile();
static void LogGlobHandler(std::vector<int>& files, const String& file); static void LogGlobHandler(std::vector<std::uint64_t>& files, const String& file);
void ReplayLog(const JsonRpcConnection::Ptr& client); void ReplayLog(const JsonRpcConnection::Ptr& client);
static void CopyCertificateFile(const String& oldCertPath, const String& newCertPath); static void CopyCertificateFile(const String& oldCertPath, const String& newCertPath);