Skip to content

fix(logger): handle file rotation errors #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 14, 2025
Merged

fix(logger): handle file rotation errors #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e39efd7
fix(logger): handle file rotation errors
NewYaroslav Sep 14, 2025
df73ffa
test: guard rotation test for C++11
NewYaroslav Sep 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 33 additions & 10 deletions include/logit_cpp/logit/loggers/FileLogger.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,16 +338,39 @@ namespace logit {

const std::string base = time_shield::to_iso8601_date(m_current_date_ts);
const std::string dir = get_directory_path();
# if defined(_WIN32)
const std::string cur = dir + "\\" + base + ".log";
std::string rotated_str;
# if __cplusplus >= 201703L
# if defined(_WIN32)
fs::path cur = (fs::u8path(dir) / (base + ".log")).lexically_normal();
fs::path rotated = fs::u8path(make_rotated_name(base, dir)).lexically_normal();
# else
fs::path cur = (fs::path(dir) / (base + ".log")).lexically_normal();
fs::path rotated = fs::path(make_rotated_name(base, dir)).lexically_normal();
# endif
std::error_code ec;
fs::rename(cur, rotated, ec);
if (ec) {
throw std::runtime_error("Failed to rename log file: " + ec.message());
}
# if defined(_WIN32)
rotated_str = rotated.u8string();
# else
rotated_str = rotated.string();
# endif
# else
# if defined(_WIN32)
const std::string cur = dir + "\\" + base + ".log";
# else
const std::string cur = dir + "/" + base + ".log";
# endif
std::string rotated = make_rotated_name(base, dir);
# if defined(_WIN32)
std::rename(utf8_to_ansi(cur).c_str(), utf8_to_ansi(rotated).c_str());
# else
std::rename(cur.c_str(), rotated.c_str());
# endif
rotated_str = make_rotated_name(base, dir);
# if defined(_WIN32)
if (std::rename(utf8_to_ansi(cur).c_str(), utf8_to_ansi(rotated_str).c_str()) != 0) {
# else
if (std::rename(cur.c_str(), rotated_str.c_str()) != 0) {
# endif
throw std::runtime_error("Failed to rename log file");
}
# endif

open_log_file(m_current_date_ts);
Expand All @@ -359,9 +382,9 @@ namespace logit {
m_compressor.reset(new detail::CompressionWorker(
m_config.compress, m_config.compress_level, m_config.external_cmd));
}
m_compressor->enqueue(rotated);
m_compressor->enqueue(rotated_str);
} else {
detail::compress_file(m_config.compress, rotated, m_config.compress_level, m_config.external_cmd);
detail::compress_file(m_config.compress, rotated_str, m_config.compress_level, m_config.external_cmd);
}
}

Expand Down
15 changes: 13 additions & 2 deletions tests/file_logger_rotation_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,28 @@
#include <LogIt.hpp>
#include <fstream>
#include <string>
#if __cplusplus >= 201703L
#include <filesystem>
#endif

int main() {
LOGIT_ADD_FILE_LOGGER_WITH_ROTATION(".", true, 30, "%v", 20, 10);
const std::string msg = "0123456789"; // 10 bytes
LOGIT_INFO(msg);
LOGIT_INFO(msg);
LOGIT_WAIT();
#if __cplusplus >= 201703L
std::filesystem::path current = LOGIT_GET_LAST_FILE_PATH(0);
std::filesystem::path rotated = current;
rotated.replace_filename(current.stem().string() + ".001.log");
return std::filesystem::exists(rotated) ? 0 : 1;
#else
std::string current = LOGIT_GET_LAST_FILE_PATH(0);
std::string rotated = current;
size_t pos = rotated.rfind(".log");
if (pos == std::string::npos) return 1;
rotated.insert(pos, ".001");
std::ifstream in(rotated);
return in.good() ? 0 : 1;
std::ifstream f(rotated.c_str());
return f.good() ? 0 : 1;
#endif
}
Loading