From a4f14c8cb67db0981cf221a3537e5787c1bb3bd7 Mon Sep 17 00:00:00 2001
From: Vaclav Haisman <vhaisman@gmail.com>
Date: Sun, 10 May 2020 23:13:01 +0200
Subject: [PATCH 1/2] Add .vscode to ignored files.

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 7cc0be609..f2f2fc868 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,6 +13,7 @@ Win32/
 x64/
 
 .idea
+.vscode
 
 # LaTeX/PDF produciton byproducts
 *.aux

From b45078d06f9b86eb2cab8ee42b4dd31db22e96ec Mon Sep 17 00:00:00 2001
From: EricTeo <39565725+zcteo@users.noreply.github.com>
Date: Tue, 6 Jul 2021 14:19:34 +0800
Subject: [PATCH 2/2] Clear files before the MaxHistory #381

TimeBasedRollingFileAppender: Clear files before the MaxHistory when CleanHistoryOnStart false. #381
(cherry picked from commit 764ae15c47921118445ddd066bea740b1d37c0e4)
---
 src/fileappender.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/fileappender.cxx b/src/fileappender.cxx
index 11ff00479..212e3cab2 100644
--- a/src/fileappender.cxx
+++ b/src/fileappender.cxx
@@ -1289,10 +1289,14 @@ TimeBasedRollingFileAppender::init()
     Time now = Time::gettimeofday();
     nextRolloverTime = calculateNextRolloverTime(now);
 
-    if (cleanHistoryOnStart)
+    if (LOG4CPLUS_UNLIKELY(cleanHistoryOnStart))
     {
         clean(now + Time(maxHistory*getRolloverPeriodDuration()));
     }
+    else
+    {
+        clean(now);
+    }
 
     lastHeartBeat = now;
 }