godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12247 from endragor/fix-rotated-logger 

Fix rotated logger naming and backup deletion

[ci skip]
This commit is contained in:
Rémi Verschelde 2017-10-20 12:57:25 +02:00 committed by GitHub
parent 5f912a9186 27b537cfca
commit 2229056fcc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/io/logger.cpp
View File

@ -110,7 +110,7 @@ void RotatedFileLogger::close_file() {
void RotatedFileLogger::clear_old_backups() { void RotatedFileLogger::clear_old_backups() {
int max_backups = max_files - 1; // -1 for the current file int max_backups = max_files - 1; // -1 for the current file
String basename = base_path.get_basename(); String basename = base_path.get_file().get_basename();
String extension = "." + base_path.get_extension(); String extension = "." + base_path.get_extension();
DirAccess *da = DirAccess::open(base_path.get_base_dir()); DirAccess *da = DirAccess::open(base_path.get_base_dir());
@ -122,7 +122,7 @@ void RotatedFileLogger::clear_old_backups() {
String f = da->get_next(); String f = da->get_next();
Set<String> backups; Set<String> backups;
while (f != String()) { while (f != String()) {
if (!da->current_is_dir() && f.begins_with(basename) && f.ends_with(extension) && f != base_path) { if (!da->current_is_dir() && f.begins_with(basename) && f.ends_with(extension) && f != base_path.get_file()) {
backups.insert(f); backups.insert(f);
} }
f = da->get_next(); f = da->get_next();
@ -149,7 +149,7 @@ void RotatedFileLogger::rotate_file() {
char timestamp[21]; char timestamp[21];
OS::Date date = OS::get_singleton()->get_date(); OS::Date date = OS::get_singleton()->get_date();
OS::Time time = OS::get_singleton()->get_time(); OS::Time time = OS::get_singleton()->get_time();
sprintf(timestamp, "-%04d-%02d-%02d-%02d-%02d-%02d", date.year, date.month, date.day + 1, time.hour, time.min, time.sec); sprintf(timestamp, "-%04d-%02d-%02d-%02d-%02d-%02d", date.year, date.month, date.day, time.hour, time.min, time.sec);
String backup_name = base_path.get_basename() + timestamp + "." + base_path.get_extension(); String backup_name = base_path.get_basename() + timestamp + "." + base_path.get_extension();