luo980/glog
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #654 from aesophor/fix-path

Browse Source 
Make LogCleaner support relative paths
This commit is contained in:
Sergiu Deitsch 2021-10-29 23:14:05 +02:00 committed by GitHub
commit 17e7679fd9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/logging.cc
View File

@ -478,7 +478,6 @@ class LogFileObject : public base::Logger {
class LogCleaner {
public:
LogCleaner();
virtual ~LogCleaner() {}
void Enable(int overdue_days);
void Disable();
@ -486,7 +485,7 @@ class LogCleaner {
const string& base_filename,
const string& filename_extension) const;
inline bool enabled() const { return enabled_; }
bool enabled() const { return enabled_; }
private:
vector<string> GetOverdueLogNames(string log_directory,
@ -1296,9 +1295,6 @@ void LogFileObject::Write(bool force_flush,
// Remove old logs
if (log_cleaner.enabled()) {
if (base_filename_selected_ && base_filename_.empty()) {
return;
}
log_cleaner.Run(base_filename_selected_,
base_filename_,
filename_extension_);
@ -1324,6 +1320,7 @@ void LogCleaner::Run(bool base_filename_selected,
const string& base_filename,
const string& filename_extension) const {
assert(enabled_ && overdue_days_ >= 0);
assert(!base_filename_selected || !base_filename.empty());
vector<string> dirs;
@ -1362,7 +1359,6 @@ vector<string> LogCleaner::GetOverdueLogNames(string log_directory,
DIR *dir;
struct dirent *ent;
if ((dir = opendir(log_directory.c_str()))) {
while ((ent = readdir(dir))) {
if (strcmp(ent->d_name, ".") == 0 || strcmp(ent->d_name, "..") == 0) {