Skip to content

SimpleLog #48

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
sy-c merged 2 commits into from
Oct 24, 2022
Merged

SimpleLog #48

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
ab3c4dd
SimpleLog: when rotateMaxFiles=1, clear file on opening and discard m…
sy-c Oct 24, 2022
ca352b6
clang
sy-c Oct 24, 2022
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
2 changes: 1 addition & 1 deletion include/Common/SimpleLog.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class SimpleLog
// Optionnaly, an automatic log rotation can be defined. Older files are renamed, appending .1, .2, .3, etc.
// \param logFilePath Path to log file. If NULL, using stdout/stderr. If /dev/null, messages are completely dropped.
// \param rotateMaxBytes Maximum file size, after which a new file is created. If zero, no limit.
// \param rotateMaxFiles Maximum number of files to keep (including the "current" file). If zero, no limit.
// \param rotateMaxFiles Maximum number of files to keep (including the "current" file). If zero, no limit. If one, a single file is created and cleared immediately, and messages are discarded after reaching rotateMaxBytes.
// \param rotateNow If non-zero, the file is immediately rotated (independently of its size), otherwise it is appended.
int setLogFile(const char* logFilePath = NULL,
unsigned long rotateMaxBytes = 0, unsigned int rotateMaxFiles = 0, unsigned int rotateNow = 0);
Expand Down
14 changes: 13 additions & 1 deletion src/SimpleLog.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,11 @@ int SimpleLog::Impl::logV(SimpleLog::Impl::Severity s, const char* message, va_l
if (fp != NULL) {
if ((ix + logFileSize > rotateMaxBytes) && (rotateMaxBytes > 0)) {
closeLogFile();
if (rotateMaxFiles == 1) {
// stop after first file
disableOutput = 1;
return -1;
}
rotate();
if (openLogFile())
return -1;
Expand Down Expand Up @@ -195,6 +200,9 @@ int SimpleLog::setLogFile(const char* logFilePath, unsigned long rotateMaxBytes,
pImpl->disableOutput = 1;
return 0;
}
if (rotateMaxFiles < 0) {
rotateMaxFiles = 1;
}
pImpl->rotateMaxBytes = rotateMaxBytes;
pImpl->rotateMaxFiles = rotateMaxFiles;
if (rotateNow) {
Expand Down Expand Up @@ -269,6 +277,10 @@ int SimpleLog::Impl::openLogFile()
if (logFilePath.length() == 0) {
return 0;
}
const char* mode = "a";
if (rotateMaxFiles == 1) {
mode = "w";
}
fp = fopen(logFilePath.c_str(), "a");
if (fp == NULL) {
return -1;
Expand Down Expand Up @@ -371,7 +383,7 @@ void SimpleLog::Impl::rotate()
} else {
inFile = dirName + fileName + "." + std::to_string(oldIndex);
}
if ((newIndex > rotateMaxFiles) && (rotateMaxFiles != 0)) {
if ((newIndex >= rotateMaxFiles) && (rotateMaxFiles != 0)) {
// this file should be removed
unlink(inFile.c_str());
} else {
Expand Down